blob: 98108daeded2903ea649b32b4ba61889eb308a4f [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
thakis@chromium.org3421c992014-11-02 02:20:32 +000010import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000011import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010012import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000013import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000014import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010015import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000016import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000017import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000018import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import optparse
20import os
21import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010022import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000023import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070025import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000027import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000028import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000029import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000030import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000032from third_party import colorama
Daniel Chengabf48472023-08-30 15:45:13 +000033from typing import Any
34from typing import List
35from typing import Mapping
36from typing import NoReturn
Daniel Cheng66d0f152023-08-29 23:21:58 +000037from typing import Optional
38from typing import Sequence
39from typing import Tuple
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000040import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000041import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000042import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000043import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000044import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000045import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000046import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000047import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000048import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000049import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000050import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000051import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000052import presubmit_canned_checks
Josip Sokcevic7958e302023-03-01 23:02:21 +000053import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000054import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +000055import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000056import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040057import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000058import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000059import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000060import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import watchlists
62
Edward Lemur79d4f992019-11-11 23:49:02 +000063from six.moves import urllib
64
65
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Joanna Wang892f2ce2023-03-14 21:39:47 +0000165# Environment variable to indicate if user is participating in the stcked
166# changes dogfood.
167DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
168
169
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000170class GitPushError(Exception):
171 pass
172
173
Daniel Chengabf48472023-08-30 15:45:13 +0000174def DieWithError(message, change_desc=None) -> NoReturn:
Christopher Lamf732cd52017-01-24 12:40:11 +1100175 if change_desc:
176 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000177 print('\n ** Content of CL description **\n' +
178 '='*72 + '\n' +
179 change_desc.description + '\n' +
180 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100181
vapiera7fbd5a2016-06-16 09:17:49 -0700182 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183 sys.exit(1)
184
185
Christopher Lamf732cd52017-01-24 12:40:11 +1100186def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000187 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000188 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000189 with open(backup_path, 'wb') as backup_file:
190 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100191
192
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000193def GetNoGitPagerEnv():
194 env = os.environ.copy()
195 # 'cat' is a magical git string that disables pagers on all platforms.
196 env['GIT_PAGER'] = 'cat'
197 return env
198
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000199
bsep@chromium.org627d9002016-04-29 00:00:52 +0000200def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000201 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
203 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000204 except subprocess2.CalledProcessError as e:
205 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000206 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000207 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
208 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000209 out = e.stdout.decode('utf-8', 'replace')
210 if e.stderr:
211 out += e.stderr.decode('utf-8', 'replace')
212 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000213
214
215def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000216 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000218
219
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000220def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000221 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700222 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000223 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700224 else:
225 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000226 try:
tandrii5d48c322016-08-18 16:19:37 -0700227 (out, _), code = subprocess2.communicate(['git'] + args,
228 env=GetNoGitPagerEnv(),
229 stdout=subprocess2.PIPE,
230 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000231 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700232 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900233 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000234 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000235
236
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000237def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000238 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000239 return RunGitWithCode(args, suppress_stderr=True)[1]
240
241
tandrii2a16b952016-10-19 07:09:44 -0700242def time_sleep(seconds):
243 # Use this so that it can be mocked in tests without interfering with python
244 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700245 return time.sleep(seconds)
246
247
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000248def time_time():
249 # Use this so that it can be mocked in tests without interfering with python
250 # system machinery.
251 return time.time()
252
253
Edward Lemur1b52d872019-05-09 21:12:12 +0000254def datetime_now():
255 # Use this so that it can be mocked in tests without interfering with python
256 # system machinery.
257 return datetime.datetime.now()
258
259
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260def confirm_or_exit(prefix='', action='confirm'):
261 """Asks user to press enter to continue or press Ctrl+C to abort."""
262 if not prefix or prefix.endswith('\n'):
263 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100264 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265 mid = ' Press'
266 elif prefix.endswith(' '):
267 mid = 'press'
268 else:
269 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000270 gclient_utils.AskForData(
271 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272
273
274def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000275 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000276 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100277 while True:
278 if 'yes'.startswith(result):
279 return True
280 if 'no'.startswith(result):
281 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000282 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100283
284
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000286 prop_list = getattr(options, 'properties', [])
287 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000288 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000289 try:
290 properties[key] = json.loads(val)
291 except ValueError:
292 pass # If a value couldn't be evaluated, treat it as a string.
293 return properties
294
295
Edward Lemur4c707a22019-09-24 21:13:43 +0000296def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000297 """Calls a buildbucket v2 method and returns the parsed json response."""
298 headers = {
299 'Accept': 'application/json',
300 'Content-Type': 'application/json',
301 }
302 request = json.dumps(request)
303 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
304
305 logging.info('POST %s with %s' % (url, request))
306
307 attempts = 1
308 time_to_sleep = 1
309 while True:
310 response, content = http.request(url, 'POST', body=request, headers=headers)
311 if response.status == 200:
312 return json.loads(content[4:])
313 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
314 msg = '%s error when calling POST %s with %s: %s' % (
315 response.status, url, request, content)
316 raise BuildbucketResponseException(msg)
317 logging.debug(
318 '%s error when calling POST %s with %s. '
319 'Sleeping for %d seconds and retrying...' % (
320 response.status, url, request, time_to_sleep))
321 time.sleep(time_to_sleep)
322 time_to_sleep *= 2
323 attempts += 1
324
325 assert False, 'unreachable'
326
327
Edward Lemur6215c792019-10-03 21:59:05 +0000328def _parse_bucket(raw_bucket):
329 legacy = True
330 project = bucket = None
331 if '/' in raw_bucket:
332 legacy = False
333 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000335 elif raw_bucket.startswith('luci.'):
336 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000338 elif '.' in raw_bucket:
339 project = raw_bucket.split('.')[0]
340 bucket = raw_bucket
341 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000342 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000343 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
344 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000345
346
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000347def _canonical_git_googlesource_host(host):
348 """Normalizes Gerrit hosts (with '-review') to Git host."""
349 assert host.endswith(_GOOGLESOURCE)
350 # Prefix doesn't include '.' at the end.
351 prefix = host[:-(1 + len(_GOOGLESOURCE))]
352 if prefix.endswith('-review'):
353 prefix = prefix[:-len('-review')]
354 return prefix + '.' + _GOOGLESOURCE
355
356
357def _canonical_gerrit_googlesource_host(host):
358 git_host = _canonical_git_googlesource_host(host)
359 prefix = git_host.split('.', 1)[0]
360 return prefix + '-review.' + _GOOGLESOURCE
361
362
363def _get_counterpart_host(host):
364 assert host.endswith(_GOOGLESOURCE)
365 git = _canonical_git_googlesource_host(host)
366 gerrit = _canonical_gerrit_googlesource_host(git)
367 return git if gerrit == host else gerrit
368
369
Quinten Yearsley777660f2020-03-04 23:37:06 +0000370def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000371 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
373 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000374 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000375 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700376 options: Command-line options.
377 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000378 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000379 for project, bucket, builder in jobs:
380 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 print('To see results here, run: git cl try-results')
382 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700383
Quinten Yearsley777660f2020-03-04 23:37:06 +0000384 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 if not requests:
386 return
387
Edward Lemur5b929a42019-10-21 17:57:39 +0000388 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000389 http.force_exception_to_status_code = True
390
391 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000392 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
393 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000394
395 errors = [
396 ' ' + response['error']['message']
397 for response in batch_response.get('responses', [])
398 if 'error' in response
399 ]
400 if errors:
401 raise BuildbucketResponseException(
402 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
403
404
Quinten Yearsley777660f2020-03-04 23:37:06 +0000405def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000406 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000407 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000408 shared_properties = {
409 'category': options.ensure_value('category', 'git_cl_try')
410 }
411 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000412 shared_properties['clobber'] = True
413 shared_properties.update(_get_properties_from_options(options) or {})
414
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000415 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 shared_tags.append({'key': 'retry_failed',
418 'value': '1'})
419
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000421 for (project, bucket, builder) in jobs:
422 properties = shared_properties.copy()
423 if 'presubmit' in builder.lower():
424 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426 requests.append({
427 'scheduleBuild': {
428 'requestId': str(uuid.uuid4()),
429 'builder': {
430 'project': getattr(options, 'project', None) or project,
431 'bucket': bucket,
432 'builder': builder,
433 },
434 'gerritChanges': gerrit_changes,
435 'properties': properties,
436 'tags': [
437 {'key': 'builder', 'value': builder},
438 ] + shared_tags,
439 }
440 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000442 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000444 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000446 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000447 'id': options.revision,
448 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000449 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000450
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000451 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000452
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000453
Quinten Yearsley777660f2020-03-04 23:37:06 +0000454def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000456
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000457 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000458 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 request = {
461 'predicate': {
462 'gerritChanges': [changelist.GetGerritChange(patchset)],
463 },
464 'fields': ','.join('builds.*.' + field for field in fields),
465 }
tandrii221ab252016-10-06 08:12:04 -0700466
Edward Lemur5b929a42019-10-21 17:57:39 +0000467 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000468 if authenticator.has_cached_credentials():
469 http = authenticator.authorize(httplib2.Http())
470 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700471 print('Warning: Some results might be missing because %s' %
472 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000473 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 http.force_exception_to_status_code = True
476
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000477 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
478 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479
Edward Lemur45768512020-03-02 19:03:14 +0000480
Edward Lemur5b929a42019-10-21 17:57:39 +0000481def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 """Fetches builds from the latest patchset that has builds (within
483 the last few patchsets).
484
485 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 changelist (Changelist): The CL to fetch builds for
487 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000488 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
489 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000491 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
492 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """
494 assert buildbucket_host
495 assert changelist.GetIssue(), 'CL must be uploaded first'
496 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000497 if latest_patchset is None:
498 assert changelist.GetMostRecentPatchset()
499 ps = changelist.GetMostRecentPatchset()
500 else:
501 assert latest_patchset > 0, latest_patchset
502 ps = latest_patchset
503
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 min_ps = max(1, ps - 5)
505 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000506 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 if len(builds):
508 return builds, ps
509 ps -= 1
510 return [], 0
511
512
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000513def _filter_failed_for_retry(all_builds):
514 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515
516 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000518 i.e. a list of buildbucket.v2.Builds which includes status and builder
519 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520
521 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000522 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 """
Edward Lemur45768512020-03-02 19:03:14 +0000525 grouped = {}
526 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000527 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000528 key = (builder['project'], builder['bucket'], builder['builder'])
529 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530
Edward Lemur45768512020-03-02 19:03:14 +0000531 jobs = []
532 for (project, bucket, builder), builds in grouped.items():
533 if 'triggered' in builder:
534 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
535 'from a parent. Please schedule a manual job for the parent '
536 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537 continue
538 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
539 # Don't retry if any are running.
540 continue
Edward Lemur45768512020-03-02 19:03:14 +0000541 # If builder had several builds, retry only if the last one failed.
542 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
543 # build, but in case of retrying failed jobs retrying a flaky one makes
544 # sense.
545 builds = sorted(builds, key=lambda b: b['createTime'])
546 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
547 continue
548 # Don't retry experimental build previously triggered by CQ.
549 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
550 for t in builds[-1]['tags']):
551 continue
552 jobs.append((project, bucket, builder))
553
554 # Sort the jobs to make testing easier.
555 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556
557
Quinten Yearsley777660f2020-03-04 23:37:06 +0000558def _print_tryjobs(options, builds):
559 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 return
563
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 longest_builder = max(len(b['builder']['builder']) for b in builds)
565 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
568 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 builds_by_status = {}
571 for b in builds:
572 builds_by_status.setdefault(b['status'], []).append({
573 'id': b['id'],
574 'name': name_fmt.format(
575 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
576 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 sort_key = lambda b: (b['name'], b['id'])
579
580 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 if not builds:
583 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000586 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 else:
589 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 print(colorize(title))
592 for b in sorted(builds, key=sort_key):
593 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594
595 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 print_builds(
597 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
598 print_builds(
599 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
600 color=Fore.MAGENTA)
601 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
602 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
603 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000604 print_builds('Started:', builds_by_status.pop('STARTED', []),
605 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000606 print_builds(
607 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 print_builds(
610 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000611 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612
613
Aiden Bennerc08566e2018-10-03 17:52:42 +0000614def _ComputeDiffLineRanges(files, upstream_commit):
615 """Gets the changed line ranges for each file since upstream_commit.
616
617 Parses a git diff on provided files and returns a dict that maps a file name
618 to an ordered list of range tuples in the form (start_line, count).
619 Ranges are in the same format as a git diff.
620 """
621 # If files is empty then diff_output will be a full diff.
622 if len(files) == 0:
623 return {}
624
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000625 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000626 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 diff_output = RunGit(diff_cmd)
628
629 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
630 # 2 capture groups
631 # 0 == fname of diff file
632 # 1 == 'diff_start,diff_count' or 'diff_start'
633 # will match each of
634 # diff --git a/foo.foo b/foo.py
635 # @@ -12,2 +14,3 @@
636 # @@ -12,2 +17 @@
637 # running re.findall on the above string with pattern will give
638 # [('foo.py', ''), ('', '14,3'), ('', '17')]
639
640 curr_file = None
641 line_diffs = {}
642 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
643 if match[0] != '':
644 # Will match the second filename in diff --git a/a.py b/b.py.
645 curr_file = match[0]
646 line_diffs[curr_file] = []
647 else:
648 # Matches +14,3
649 if ',' in match[1]:
650 diff_start, diff_count = match[1].split(',')
651 else:
652 # Single line changes are of the form +12 instead of +12,1.
653 diff_start = match[1]
654 diff_count = 1
655
656 diff_start = int(diff_start)
657 diff_count = int(diff_count)
658
659 # If diff_count == 0 this is a removal we can ignore.
660 line_diffs[curr_file].append((diff_start, diff_count))
661
662 return line_diffs
663
664
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 """Checks if a yapf file is in any parent directory of fpath until top_dir.
667
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000669 is found returns None. Uses yapf_config_cache as a cache for previously found
670 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 # Return result if we've already computed it.
674 if fpath in yapf_config_cache:
675 return yapf_config_cache[fpath]
676
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 parent_dir = os.path.dirname(fpath)
678 if os.path.isfile(fpath):
679 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 # Otherwise fpath is a directory
682 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
683 if os.path.isfile(yapf_file):
684 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000685 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # If we're at the top level directory, or if we're at root
687 # there is no provided style.
688 ret = None
689 else:
690 # Otherwise recurse on the current directory.
691 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 yapf_config_cache[fpath] = ret
693 return ret
694
695
Brian Sheedyb4307d52019-12-02 19:18:17 +0000696def _GetYapfIgnorePatterns(top_dir):
697 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000698
699 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
700 but this functionality appears to break when explicitly passing files to
701 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000702 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703 the .yapfignore file should be in the directory that yapf is invoked from,
704 which we assume to be the top level directory in this case.
705
706 Args:
707 top_dir: The top level directory for the repository being formatted.
708
709 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000710 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711 """
712 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000714 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716
Anthony Politoc64e3902021-04-30 21:55:25 +0000717 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
718 stripped_line = line.strip()
719 # Comments and blank lines should be ignored.
720 if stripped_line.startswith('#') or stripped_line == '':
721 continue
722 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 return ignore_patterns
724
725
726def _FilterYapfIgnoredFiles(filepaths, patterns):
727 """Filters out any filepaths that match any of the given patterns.
728
729 Args:
730 filepaths: An iterable of strings containing filepaths to filter.
731 patterns: An iterable of strings containing fnmatch patterns to filter on.
732
733 Returns:
734 A list of strings containing all the elements of |filepaths| that did not
735 match any of the patterns in |patterns|.
736 """
737 # Not inlined so that tests can use the same implementation.
738 return [f for f in filepaths
739 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000740
741
Daniel Cheng66d0f152023-08-29 23:21:58 +0000742def _GetCommitCountSummary(begin_commit: str,
743 end_commit: str = "HEAD") -> Optional[str]:
744 """Generate a summary of the number of commits in (begin_commit, end_commit).
745
746 Returns a string containing the summary, or None if the range is empty.
747 """
748 count = int(
749 RunGitSilent(['rev-list', '--count', f'{begin_commit}..{end_commit}']))
750
751 if not count:
752 return None
753
754 return f'{count} commit{"s"[:count!=1]}'
755
756
Aaron Gable13101a62018-02-09 13:20:41 -0800757def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758 """Prints statistics about the change to the user."""
759 # --no-ext-diff is broken in some versions of Git, so try to work around
760 # this by overriding the environment (but there is still a problem if the
761 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000762 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000763 if 'GIT_EXTERNAL_DIFF' in env:
764 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000765
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000766 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800767 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000768 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000769
770
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000771class BuildbucketResponseException(Exception):
772 pass
773
774
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775class Settings(object):
776 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000778 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000779 self.tree_status_url = None
780 self.viewvc_url = None
781 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000782 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000783 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000784 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000785 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000786 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000787 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788
Edward Lemur26964072020-02-19 19:18:51 +0000789 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000791 if self.updated:
792 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000793
Edward Lemur26964072020-02-19 19:18:51 +0000794 # The only value that actually changes the behavior is
795 # autoupdate = "false". Everything else means "true".
796 autoupdate = (
797 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
798
799 cr_settings_file = FindCodereviewSettingsFile()
800 if autoupdate != 'false' and cr_settings_file:
801 LoadCodereviewSettingsFromFile(cr_settings_file)
802 cr_settings_file.close()
803
804 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000808 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815 def GetTreeStatusUrl(self, error_ok=False):
816 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000817 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
818 if self.tree_status_url is None and not error_ok:
819 DieWithError(
820 'You must configure your tree status URL by running '
821 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 return self.tree_status_url
823
824 def GetViewVCUrl(self):
825 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000826 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827 return self.viewvc_url
828
rmistry@google.com90752582014-01-14 21:04:50 +0000829 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000830 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000831
rmistry@google.com5626a922015-02-26 14:03:30 +0000832 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000833 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000834 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000835 return run_post_upload_hook == "True"
836
Joanna Wangc8f23e22023-01-19 21:18:10 +0000837 def GetDefaultCCList(self):
838 return self._GetConfig('rietveld.cc')
839
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000840 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000841 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000842 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000843 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
844 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000845 # Default is squash now (http://crbug.com/611892#c23).
846 self.squash_gerrit_uploads = self._GetConfig(
847 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 return self.squash_gerrit_uploads
849
Edward Lesmes4de54132020-05-05 19:41:33 +0000850 def GetSquashGerritUploadsOverride(self):
851 """Return True or False if codereview.settings should be overridden.
852
853 Returns None if no override has been defined.
854 """
855 # See also http://crbug.com/611892#c23
856 result = self._GetConfig('gerrit.override-squash-uploads').lower()
857 if result == 'true':
858 return True
859 if result == 'false':
860 return False
861 return None
862
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000863 def GetIsGerrit(self):
864 """Return True if gerrit.host is set."""
865 if self.is_gerrit is None:
866 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
867 return self.is_gerrit
868
tandrii@chromium.org28253532016-04-14 13:46:56 +0000869 def GetGerritSkipEnsureAuthenticated(self):
870 """Return True if EnsureAuthenticated should not be done for Gerrit
871 uploads."""
872 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000873 self.gerrit_skip_ensure_authenticated = self._GetConfig(
874 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000875 return self.gerrit_skip_ensure_authenticated
876
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000877 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000878 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000880 # Git requires single quotes for paths with spaces. We need to replace
881 # them with double quotes for Windows to treat such paths as a single
882 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000883 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000884 return self.git_editor or None
885
thestig@chromium.org44202a22014-03-11 19:22:18 +0000886 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000887 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000888
889 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000890 return self._GetConfig(
891 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000892
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000893 def GetFormatFullByDefault(self):
894 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000895 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000896 result = (
897 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
898 error_ok=True).strip())
899 self.format_full_by_default = (result == 'true')
900 return self.format_full_by_default
901
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000902 def IsStatusCommitOrderByDate(self):
903 if self.is_status_commit_order_by_date is None:
904 result = (RunGit(['config', '--bool', 'cl.date-order'],
905 error_ok=True).strip())
906 self.is_status_commit_order_by_date = (result == 'true')
907 return self.is_status_commit_order_by_date
908
Edward Lemur26964072020-02-19 19:18:51 +0000909 def _GetConfig(self, key, default=''):
910 self._LazyUpdateIfNeeded()
911 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000912
913
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000914class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000915 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000916 NONE = 'none'
917 DRY_RUN = 'dry_run'
918 COMMIT = 'commit'
919
Struan Shrimpton8b2072b2023-07-31 21:01:26 +0000920 ALL_STATES = [NONE, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000921
922
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000923class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000924 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925 self.issue = issue
926 self.patchset = patchset
927 self.hostname = hostname
928
929 @property
930 def valid(self):
931 return self.issue is not None
932
933
Edward Lemurf38bc172019-09-03 21:02:13 +0000934def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
936 fail_result = _ParsedIssueNumberArgument()
937
Edward Lemur678a6842019-10-03 22:25:05 +0000938 if isinstance(arg, int):
939 return _ParsedIssueNumberArgument(issue=arg)
Gavin Makcc976552023-08-28 17:01:52 +0000940 if not isinstance(arg, str):
Edward Lemur678a6842019-10-03 22:25:05 +0000941 return fail_result
942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000944 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700945
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000946 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000947 if not url.startswith('http'):
948 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000949 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
950 if url.startswith(short_url):
951 url = gerrit_url + url[len(short_url):]
952 break
953
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000954 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000955 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000956 except ValueError:
957 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200958
Alex Turner30ae6372022-01-04 02:32:52 +0000959 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
960 # URL.
961 if not arg.startswith('http') and '.' not in parsed_url.netloc:
962 return fail_result
963
Edward Lemur678a6842019-10-03 22:25:05 +0000964 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
965 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
966 # Short urls like https://domain/<issue_number> can be used, but don't allow
967 # specifying the patchset (you'd 404), but we allow that here.
968 if parsed_url.path == '/':
969 part = parsed_url.fragment
970 else:
971 part = parsed_url.path
972
973 match = re.match(
974 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
975 if not match:
976 return fail_result
977
978 issue = int(match.group('issue'))
979 patchset = match.group('patchset')
980 return _ParsedIssueNumberArgument(
981 issue=issue,
982 patchset=int(patchset) if patchset else None,
983 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000984
985
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000986def _create_description_from_log(args):
987 """Pulls out the commit log to use as a base for the CL description."""
988 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000989 if len(args) == 1 and args[0] == None:
990 # Handle the case where None is passed as the branch.
991 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000992 if len(args) == 1 and not args[0].endswith('.'):
993 log_args = [args[0] + '..']
994 elif len(args) == 1 and args[0].endswith('...'):
995 log_args = [args[0][:-1]]
996 elif len(args) == 2:
997 log_args = [args[0] + '..' + args[1]]
998 else:
999 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +00001000 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001001
1002
Aaron Gablea45ee112016-11-22 15:14:38 -08001003class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001004 def __init__(self, issue, url):
1005 self.issue = issue
1006 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001007 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001008
1009 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001010 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001011 self.issue, self.url)
1012
1013
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001014_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001015 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001016 # TODO(tandrii): these two aren't known in Gerrit.
1017 'approval', 'disapproval'])
1018
1019
Joanna Wang6215dd02023-02-07 15:58:03 +00001020# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001021_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001022 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001023 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001024])
1025
1026
Daniel Chengabf48472023-08-30 15:45:13 +00001027class ChangeDescription(object):
1028 """Contains a parsed form of the change description."""
1029 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
1030 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
1031 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
1032 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
1033 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
1034 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
1035 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
1036 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
1037 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
1038
1039 def __init__(self, description, bug=None, fixed=None):
1040 self._description_lines = (description or '').strip().splitlines()
1041 if bug:
1042 regexp = re.compile(self.BUG_LINE)
1043 prefix = settings.GetBugPrefix()
1044 if not any((regexp.match(line) for line in self._description_lines)):
1045 values = list(_get_bug_line_values(prefix, bug))
1046 self.append_footer('Bug: %s' % ', '.join(values))
1047 if fixed:
1048 regexp = re.compile(self.FIXED_LINE)
1049 prefix = settings.GetBugPrefix()
1050 if not any((regexp.match(line) for line in self._description_lines)):
1051 values = list(_get_bug_line_values(prefix, fixed))
1052 self.append_footer('Fixed: %s' % ', '.join(values))
1053
1054 @property # www.logilab.org/ticket/89786
1055 def description(self): # pylint: disable=method-hidden
1056 return '\n'.join(self._description_lines)
1057
1058 def set_description(self, desc):
1059 if isinstance(desc, str):
1060 lines = desc.splitlines()
1061 else:
1062 lines = [line.rstrip() for line in desc]
1063 while lines and not lines[0]:
1064 lines.pop(0)
1065 while lines and not lines[-1]:
1066 lines.pop(-1)
1067 self._description_lines = lines
1068
1069 def ensure_change_id(self, change_id):
1070 description = self.description
1071 footer_change_ids = git_footers.get_footer_change_id(description)
1072 # Make sure that the Change-Id in the description matches the given one.
1073 if footer_change_ids != [change_id]:
1074 if footer_change_ids:
1075 # Remove any existing Change-Id footers since they don't match the
1076 # expected change_id footer.
1077 description = git_footers.remove_footer(description, 'Change-Id')
1078 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
1079 'if you want to set a new one.')
1080 # Add the expected Change-Id footer.
1081 description = git_footers.add_footer_change_id(description, change_id)
1082 self.set_description(description)
1083
1084 def update_reviewers(self, reviewers):
1085 """Rewrites the R= line(s) as a single line each.
1086
1087 Args:
1088 reviewers (list(str)) - list of additional emails to use for reviewers.
1089 """
1090 if not reviewers:
1091 return
1092
1093 reviewers = set(reviewers)
1094
1095 # Get the set of R= lines and remove them from the description.
1096 regexp = re.compile(self.R_LINE)
1097 matches = [regexp.match(line) for line in self._description_lines]
1098 new_desc = [
1099 l for i, l in enumerate(self._description_lines) if not matches[i]
1100 ]
1101 self.set_description(new_desc)
1102
1103 # Construct new unified R= lines.
1104
1105 # First, update reviewers with names from the R= lines (if any).
1106 for match in matches:
1107 if not match:
1108 continue
1109 reviewers.update(cleanup_list([match.group(2).strip()]))
1110
1111 new_r_line = 'R=' + ', '.join(sorted(reviewers))
1112
1113 # Put the new lines in the description where the old first R= line was.
1114 line_loc = next((i for i, match in enumerate(matches) if match), -1)
1115 if 0 <= line_loc < len(self._description_lines):
1116 self._description_lines.insert(line_loc, new_r_line)
1117 else:
1118 self.append_footer(new_r_line)
1119
1120 def set_preserve_tryjobs(self):
1121 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
1122 footers = git_footers.parse_footers(self.description)
1123 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
1124 if v.lower() == 'true':
1125 return
1126 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
1127
1128 def prompt(self):
1129 """Asks the user to update the description."""
1130 self.set_description([
1131 '# Enter a description of the change.',
1132 '# This will be displayed on the codereview site.',
1133 '# The first line will also be used as the subject of the review.',
1134 '#--------------------This line is 72 characters long'
1135 '--------------------',
1136 ] + self._description_lines)
1137 bug_regexp = re.compile(self.BUG_LINE)
1138 fixed_regexp = re.compile(self.FIXED_LINE)
1139 prefix = settings.GetBugPrefix()
1140 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
1141
1142 if not any((has_issue(line) for line in self._description_lines)):
1143 self.append_footer('Bug: %s' % prefix)
1144
1145 print('Waiting for editor...')
1146 content = gclient_utils.RunEditor(self.description,
1147 True,
1148 git_editor=settings.GetGitEditor())
1149 if not content:
1150 DieWithError('Running editor failed')
1151 lines = content.splitlines()
1152
1153 # Strip off comments and default inserted "Bug:" line.
1154 clean_lines = [
1155 line.rstrip() for line in lines
1156 if not (line.startswith('#') or line.rstrip() == "Bug:"
1157 or line.rstrip() == "Bug: " + prefix)
1158 ]
1159 if not clean_lines:
1160 DieWithError('No CL description, aborting')
1161 self.set_description(clean_lines)
1162
1163 def append_footer(self, line):
1164 """Adds a footer line to the description.
1165
1166 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
1167 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
1168 that Gerrit footers are always at the end.
1169 """
1170 parsed_footer_line = git_footers.parse_footer(line)
1171 if parsed_footer_line:
1172 # Line is a gerrit footer in the form: Footer-Key: any value.
1173 # Thus, must be appended observing Gerrit footer rules.
1174 self.set_description(
1175 git_footers.add_footer(self.description,
1176 key=parsed_footer_line[0],
1177 value=parsed_footer_line[1]))
1178 return
1179
1180 if not self._description_lines:
1181 self._description_lines.append(line)
1182 return
1183
1184 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
1185 if gerrit_footers:
1186 # git_footers.split_footers ensures that there is an empty line before
1187 # actual (gerrit) footers, if any. We have to keep it that way.
1188 assert top_lines and top_lines[-1] == ''
1189 top_lines, separator = top_lines[:-1], top_lines[-1:]
1190 else:
1191 separator = [] # No need for separator if there are no gerrit_footers.
1192
1193 prev_line = top_lines[-1] if top_lines else ''
1194 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line)
1195 or not presubmit_support.Change.TAG_LINE_RE.match(line)):
1196 top_lines.append('')
1197 top_lines.append(line)
1198 self._description_lines = top_lines + separator + gerrit_footers
1199
1200 def get_reviewers(self, tbr_only=False):
1201 """Retrieves the list of reviewers."""
1202 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
1203 reviewers = [
1204 match.group(2).strip() for match in matches
1205 if match and (not tbr_only or match.group(1).upper() == 'TBR')
1206 ]
1207 return cleanup_list(reviewers)
1208
1209 def get_cced(self):
1210 """Retrieves the list of reviewers."""
1211 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
1212 cced = [match.group(2).strip() for match in matches if match]
1213 return cleanup_list(cced)
1214
1215 def get_hash_tags(self):
1216 """Extracts and sanitizes a list of Gerrit hashtags."""
1217 subject = (self._description_lines or ('', ))[0]
1218 subject = re.sub(self.STRIP_HASH_TAG_PREFIX,
1219 '',
1220 subject,
1221 flags=re.IGNORECASE)
1222
1223 tags = []
1224 start = 0
1225 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
1226 while True:
1227 m = bracket_exp.match(subject, start)
1228 if not m:
1229 break
1230 tags.append(self.sanitize_hash_tag(m.group(1)))
1231 start = m.end()
1232
1233 if not tags:
1234 # Try "Tag: " prefix.
1235 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
1236 if m:
1237 tags.append(self.sanitize_hash_tag(m.group(1)))
1238 return tags
1239
1240 @classmethod
1241 def sanitize_hash_tag(cls, tag):
1242 """Returns a sanitized Gerrit hash tag.
1243
1244 A sanitized hashtag can be used as a git push refspec parameter value.
1245 """
1246 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
1247
1248
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001250 """Changelist works with one changelist in local branch.
1251
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001252 Notes:
1253 * Not safe for concurrent multi-{thread,process} use.
1254 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001255 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001256 """
1257
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001258 def __init__(self,
1259 branchref=None,
1260 issue=None,
1261 codereview_host=None,
1262 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001263 """Create a new ChangeList instance.
1264
Edward Lemurf38bc172019-09-03 21:02:13 +00001265 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001266 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001268 global settings
1269 if not settings:
1270 # Happens when git_cl.py is used as a utility library.
1271 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001272
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273 self.branchref = branchref
1274 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001275 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001276 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277 else:
1278 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001279 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001281 self.lookedup_issue = False
1282 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001284 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001286 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001287 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001288 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001289 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001290
Edward Lemur125d60a2019-09-13 18:25:41 +00001291 # Lazily cached values.
1292 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1293 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001294 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001295 # Map from change number (issue) to its detail cache.
1296 self._detail_cache = {}
1297
1298 if codereview_host is not None:
1299 assert not codereview_host.startswith('https://'), codereview_host
1300 self._gerrit_host = codereview_host
1301 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001302
Edward Lesmese1576912021-02-16 21:53:34 +00001303 @property
1304 def owners_client(self):
1305 if self._owners_client is None:
1306 remote, remote_branch = self.GetRemoteBranch()
1307 branch = GetTargetRef(remote, remote_branch, None)
1308 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001309 host=self.GetGerritHost(),
1310 project=self.GetGerritProject(),
1311 branch=branch)
1312 return self._owners_client
1313
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001314 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001315 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001316
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001317 The return value is a string suitable for passing to git cl with the --cc
1318 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001319 """
1320 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001321 base_cc = settings.GetDefaultCCList()
1322 more_cc = ','.join(self.more_cc)
1323 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001324 return self.cc
1325
Daniel Cheng7227d212017-11-17 08:12:37 -08001326 def ExtendCC(self, more_cc):
1327 """Extends the list of users to cc on this CL based on the changed files."""
1328 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001329
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001330 def GetCommitDate(self):
1331 """Returns the commit date as provided in the constructor"""
1332 return self.commit_date
1333
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001334 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001335 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001336 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001337 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001338 if not branchref:
1339 return None
1340 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001341 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001342 return self.branch
1343
1344 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001345 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001346 self.GetBranch() # Poke the lazy loader.
1347 return self.branchref
1348
Edward Lemur85153282020-02-14 22:06:29 +00001349 def _GitGetBranchConfigValue(self, key, default=None):
1350 return scm.GIT.GetBranchConfig(
1351 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001352
Edward Lemur85153282020-02-14 22:06:29 +00001353 def _GitSetBranchConfigValue(self, key, value):
1354 action = 'set %s to %r' % (key, value)
1355 if not value:
1356 action = 'unset %s' % key
1357 assert self.GetBranch(), 'a branch is needed to ' + action
1358 return scm.GIT.SetBranchConfig(
1359 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001360
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001361 @staticmethod
1362 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001363 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001364 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001365 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001366 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1367 settings.GetRoot(), branch)
1368 if not remote or not upstream_branch:
1369 DieWithError(
1370 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001371 'Verify this branch is set up to track another \n'
1372 '(via the --track argument to "git checkout -b ..."). \n'
1373 'or pass complete "git diff"-style arguments if supported, like\n'
1374 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375
1376 return remote, upstream_branch
1377
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001378 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001379 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001380 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001381 DieWithError('The upstream for the current branch (%s) does not exist '
1382 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001383 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001384 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001385
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386 def GetUpstreamBranch(self):
1387 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001389 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001390 upstream_branch = upstream_branch.replace('refs/heads/',
1391 'refs/remotes/%s/' % remote)
1392 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1393 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 self.upstream_branch = upstream_branch
1395 return self.upstream_branch
1396
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001397 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001398 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001399 remote, branch = None, self.GetBranch()
1400 seen_branches = set()
1401 while branch not in seen_branches:
1402 seen_branches.add(branch)
1403 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001404 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001405 if remote != '.' or branch.startswith('refs/remotes'):
1406 break
1407 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001408 remotes = RunGit(['remote'], error_ok=True).split()
1409 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001410 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001411 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001412 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001413 logging.warning('Could not determine which remote this change is '
1414 'associated with, so defaulting to "%s".' %
1415 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001416 else:
Gavin Make6a62332020-12-04 21:57:10 +00001417 logging.warning('Could not determine which remote this change is '
1418 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001419 branch = 'HEAD'
1420 if branch.startswith('refs/remotes'):
1421 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001422 elif branch.startswith('refs/branch-heads/'):
1423 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001424 else:
1425 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001426 return self._remote
1427
Daniel Chengabf48472023-08-30 15:45:13 +00001428 def GetRemoteUrl(self) -> Optional[str]:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1430
1431 Returns None if there is no remote.
1432 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001433 is_cached, value = self._cached_remote_url
1434 if is_cached:
1435 return value
1436
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001437 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001438 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001439
Edward Lemur298f2cf2019-02-22 21:40:39 +00001440 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001441 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001442 if host:
1443 self._cached_remote_url = (True, url)
1444 return url
1445
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001446 # If it cannot be parsed as an url, assume it is a local directory,
1447 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001448 logging.warning('"%s" doesn\'t appear to point to a git host. '
1449 'Interpreting it as a local directory.', url)
1450 if not os.path.isdir(url):
1451 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001452 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1453 'but it doesn\'t exist.',
1454 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001455 return None
1456
1457 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001458 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001459
Edward Lemur79d4f992019-11-11 23:49:02 +00001460 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001461 if not host:
1462 logging.error(
1463 'Remote "%(remote)s" for branch "%(branch)s" points to '
1464 '"%(cache_path)s", but it is misconfigured.\n'
1465 '"%(cache_path)s" must be a git repo and must have a remote named '
1466 '"%(remote)s" pointing to the git host.', {
1467 'remote': remote,
1468 'cache_path': cache_path,
1469 'branch': self.GetBranch()})
1470 return None
1471
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001472 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001473 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001474
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001475 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001476 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001477 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001478 if self.GetBranch():
1479 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001480 if self.issue is not None:
1481 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001482 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001483 return self.issue
1484
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001485 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001486 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001487 issue = self.GetIssue()
1488 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001489 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001490 server = self.GetCodereviewServer()
1491 if short:
1492 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1493 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001494
Edward Lemur6c6827c2020-02-06 21:15:18 +00001495 def FetchDescription(self, pretty=False):
1496 assert self.GetIssue(), 'issue is required to query Gerrit'
1497
Edward Lemur9aa1a962020-02-25 00:58:38 +00001498 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001499 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1500 current_rev = data['current_revision']
1501 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001502
1503 if not pretty:
1504 return self.description
1505
1506 # Set width to 72 columns + 2 space indent.
1507 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1508 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1509 lines = self.description.splitlines()
1510 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001511
1512 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001513 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001514 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001515 if self.GetBranch():
1516 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001517 if self.patchset is not None:
1518 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001519 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001520 return self.patchset
1521
Edward Lemur9aa1a962020-02-25 00:58:38 +00001522 def GetAuthor(self):
1523 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1524
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001525 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001526 """Set this branch's patchset. If patchset=0, clears the patchset."""
1527 assert self.GetBranch()
1528 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001529 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001530 else:
1531 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001532 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001533
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001534 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001535 """Set this branch's issue. If issue isn't given, clears the issue."""
1536 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001537 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001538 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001539 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001540 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001541 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001542 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001543 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001544 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001545 else:
tandrii5d48c322016-08-18 16:19:37 -07001546 # Reset all of these just to be clean.
1547 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001548 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001549 ISSUE_CONFIG_KEY,
1550 PATCHSET_CONFIG_KEY,
1551 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001552 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001553 ]
tandrii5d48c322016-08-18 16:19:37 -07001554 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001555 try:
1556 self._GitSetBranchConfigValue(prop, None)
1557 except subprocess2.CalledProcessError:
1558 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001559 msg = RunGit(['log', '-1', '--format=%B']).strip()
1560 if msg and git_footers.get_footer_change_id(msg):
1561 print('WARNING: The change patched into this branch has a Change-Id. '
1562 'Removing it.')
1563 RunGit(['commit', '--amend', '-m',
1564 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001565 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001566 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001567 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001568
Daniel Chengabf48472023-08-30 15:45:13 +00001569 def GetAffectedFiles(self,
1570 upstream: str,
1571 end_commit: Optional[str] = None) -> Sequence[str]:
Joanna Wangb46232e2023-01-21 01:58:46 +00001572 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001573 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001574 return [
1575 f for _, f in scm.GIT.CaptureStatus(
1576 settings.GetRoot(), upstream, end_commit=end_commit)
1577 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001578 except subprocess2.CalledProcessError:
1579 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001580 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001581 'This branch probably doesn\'t exist anymore. To reset the\n'
1582 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001583 ' git branch --set-upstream-to origin/main %s\n'
1584 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001585 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001586
dsansomee2d6fd92016-09-08 00:10:47 -07001587 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001588 assert self.GetIssue(), 'issue is required to update description'
1589
1590 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001591 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001592 if not force:
1593 confirm_or_exit(
1594 'The description cannot be modified while the issue has a pending '
1595 'unpublished edit. Either publish the edit in the Gerrit web UI '
1596 'or delete it.\n\n', action='delete the unpublished edit')
1597
1598 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001599 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001600 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001601 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001602 description, notify='NONE')
1603
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001604 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001605
Edward Lemur75526302020-02-27 22:31:05 +00001606 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001607 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001608 '--root', settings.GetRoot(),
1609 '--upstream', upstream,
1610 ]
1611
1612 args.extend(['--verbose'] * verbose)
1613
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001614 remote, remote_branch = self.GetRemoteBranch()
1615 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001616 if settings.GetIsGerrit():
1617 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1618 args.extend(['--gerrit_project', self.GetGerritProject()])
1619 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001620
Edward Lemur99df04e2020-03-05 19:39:43 +00001621 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001622 issue = self.GetIssue()
1623 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001624 if author:
1625 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001626 if issue:
1627 args.extend(['--issue', str(issue)])
1628 if patchset:
1629 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001630
Edward Lemur75526302020-02-27 22:31:05 +00001631 return args
1632
Josip Sokcevic017544d2022-03-31 23:47:53 +00001633 def RunHook(self,
1634 committing,
1635 may_prompt,
1636 verbose,
1637 parallel,
1638 upstream,
1639 description,
1640 all_files,
1641 files=None,
1642 resultdb=False,
1643 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001644 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1645 args = self._GetCommonPresubmitArgs(verbose, upstream)
1646 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001647 if may_prompt:
1648 args.append('--may_prompt')
1649 if parallel:
1650 args.append('--parallel')
1651 if all_files:
1652 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001653 if files:
1654 args.extend(files.split(';'))
1655 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001656 if files or all_files:
1657 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001658
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001659 if resultdb and not realm:
1660 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1661 # it is not required to pass the realm flag
1662 print('Note: ResultDB reporting will NOT be performed because --realm'
1663 ' was not specified. To enable ResultDB, please run the command'
1664 ' again with the --realm argument to specify the LUCI realm.')
1665
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001666 return self._RunPresubmit(args,
1667 description,
1668 resultdb=resultdb,
1669 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001670
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001671 def _RunPresubmit(self,
Daniel Chengabf48472023-08-30 15:45:13 +00001672 args: Sequence[str],
1673 description: str,
1674 resultdb: bool = False,
1675 realm: Optional[str] = None) -> Mapping[str, Any]:
1676 args = list(args)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001677
Edward Lemur227d5102020-02-25 23:45:35 +00001678 with gclient_utils.temporary_file() as description_file:
1679 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001680 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001681 args.extend(['--json_output', json_output])
1682 args.extend(['--description_file', description_file])
Edward Lemur227d5102020-02-25 23:45:35 +00001683 start = time_time()
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001684 cmd = ['vpython3', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001685 if resultdb and realm:
1686 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001687
1688 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001689 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001690
Edward Lemur227d5102020-02-25 23:45:35 +00001691 metrics.collector.add_repeated('sub_commands', {
1692 'command': 'presubmit',
1693 'execution_time': time_time() - start,
1694 'exit_code': exit_code,
1695 })
1696
1697 if exit_code:
1698 sys.exit(exit_code)
1699
1700 json_results = gclient_utils.FileRead(json_output)
1701 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001703 def RunPostUploadHook(self, verbose, upstream, description):
Edward Lemur75526302020-02-27 22:31:05 +00001704 args = self._GetCommonPresubmitArgs(verbose, upstream)
1705 args.append('--post_upload')
1706
1707 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001708 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001709 args.extend(['--description_file', description_file])
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001710 subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args).wait()
Edward Lemur75526302020-02-27 22:31:05 +00001711
Daniel Chengabf48472023-08-30 15:45:13 +00001712 def _GetDescriptionForUpload(self, options: optparse.Values,
1713 git_diff_args: Sequence[str],
1714 files: Sequence[str]) -> ChangeDescription:
Joanna Wangb46232e2023-01-21 01:58:46 +00001715 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001716 if self.GetIssue():
1717 description = self.FetchDescription()
1718 elif options.message:
1719 description = options.message
1720 else:
1721 description = _create_description_from_log(git_diff_args)
1722 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001723 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001724
Edward Lemur5a644f82020-03-18 16:44:57 +00001725 bug = options.bug
1726 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001727 if not self.GetIssue():
1728 # Extract bug number from branch name, but only if issue is being created.
1729 # It must start with bug or fix, followed by _ or - and number.
1730 # Optionally, it may contain _ or - after number with arbitrary text.
1731 # Examples:
1732 # bug-123
1733 # bug_123
1734 # fix-123
1735 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001736 branch = self.GetBranch()
1737 if branch is not None:
1738 match = re.match(
1739 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1740 if not bug and not fixed and match:
1741 if match.group('type') == 'bug':
1742 bug = match.group('bugnum')
1743 else:
1744 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001745
1746 change_description = ChangeDescription(description, bug, fixed)
1747
Joanna Wang39811b12023-01-20 23:09:48 +00001748 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001749 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001750 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001751 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001752 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001753 missing_files = [
1754 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001755 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001756 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001757 owners = self.owners_client.SuggestOwners(
1758 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001759 assert isinstance(options.reviewers, list), options.reviewers
1760 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001761
Edward Lemur5a644f82020-03-18 16:44:57 +00001762 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001763 if options.reviewers:
1764 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001765
1766 return change_description
1767
Joanna Wanga1abbed2023-01-24 01:41:05 +00001768 def _GetTitleForUpload(self, options, multi_change_upload=False):
1769 # type: (optparse.Values, Optional[bool]) -> str
1770
1771 # Getting titles for multipl commits is not supported so we return the
1772 # default.
1773 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001774 return options.title
1775
1776 # On first upload, patchset title is always this string, while options.title
1777 # gets converted to first line of message.
1778 if not self.GetIssue():
1779 return 'Initial upload'
1780
1781 # When uploading subsequent patchsets, options.message is taken as the title
1782 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001783 if options.message:
1784 return options.message.strip()
1785
1786 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001787 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001788 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001789 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001790 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001791
1792 # Use the default title if the user confirms the default with a 'y'.
1793 if user_title.lower() == 'y':
1794 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001795 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001796
Joanna Wang562481d2023-01-26 21:57:14 +00001797 def _GetRefSpecOptions(self,
Daniel Chengabf48472023-08-30 15:45:13 +00001798 options: optparse.Values,
1799 change_desc: ChangeDescription,
1800 multi_change_upload: bool = False,
1801 dogfood_path: bool = False) -> List[str]:
Joanna Wanga1abbed2023-01-24 01:41:05 +00001802 # Extra options that can be specified at push time. Doc:
1803 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1804 refspec_opts = []
1805
1806 # By default, new changes are started in WIP mode, and subsequent patchsets
1807 # don't send email. At any time, passing --send-mail or --send-email will
1808 # mark the change ready and send email for that particular patch.
1809 if options.send_mail:
1810 refspec_opts.append('ready')
1811 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001812 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001813 refspec_opts.append('wip')
Joanna Wangcea35a32023-08-28 21:30:59 +00001814 else:
1815 refspec_opts.append('notify=NONE')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001816
1817 # TODO(tandrii): options.message should be posted as a comment if
1818 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1819 # to do it.
1820
1821 # Set options.title in case user was prompted in _GetTitleForUpload and
1822 # _CMDUploadChange needs to be called again.
1823 options.title = self._GetTitleForUpload(
1824 options, multi_change_upload=multi_change_upload)
1825
1826 if options.title:
1827 # Punctuation and whitespace in |title| must be percent-encoded.
1828 refspec_opts.append('m=' +
1829 gerrit_util.PercentEncodeForGitRef(options.title))
1830
1831 if options.private:
1832 refspec_opts.append('private')
1833
1834 if options.topic:
1835 # Documentation on Gerrit topics is here:
1836 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1837 refspec_opts.append('topic=%s' % options.topic)
1838
1839 if options.enable_auto_submit:
1840 refspec_opts.append('l=Auto-Submit+1')
1841 if options.set_bot_commit:
1842 refspec_opts.append('l=Bot-Commit+1')
1843 if options.use_commit_queue:
1844 refspec_opts.append('l=Commit-Queue+2')
1845 elif options.cq_dry_run:
1846 refspec_opts.append('l=Commit-Queue+1')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001847
1848 if change_desc.get_reviewers(tbr_only=True):
1849 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1850 self.GetGerritProject())
1851 refspec_opts.append('l=Code-Review+%s' % score)
1852
Joanna Wang40497912023-01-24 21:18:16 +00001853 # Gerrit sorts hashtags, so order is not important.
1854 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1855 # We check GetIssue because we only add hashtags from the
1856 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001857 # TODO(b/265929888): When we fully launch the new path:
1858 # 1) remove fetching hashtags from description alltogether
1859 # 2) Or use descrtiption hashtags for:
1860 # `not (self.GetIssue() and multi_change_upload)`
1861 # 3) Or enabled change description tags for multi and single changes
1862 # by adding them post `git push`.
1863 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001864 hashtags.update(change_desc.get_hash_tags())
1865 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001866
1867 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001868 # branch/change.
1869 return refspec_opts
1870
Joanna Wang05b60342023-03-29 20:25:57 +00001871 def PrepareSquashedCommit(self,
Daniel Chengabf48472023-08-30 15:45:13 +00001872 options: optparse.Values,
1873 parent: str,
1874 orig_parent: str,
1875 end_commit: Optional[str] = None) -> _NewUpload:
Joanna Wang05b60342023-03-29 20:25:57 +00001876 """Create a squashed commit to upload.
1877
1878
1879 Args:
1880 parent: The commit to use as the parent for the new squashed.
1881 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1882 is part of the same original tree as end_commit, which does not
1883 contain squashed commits. This is used to create the change
1884 description for the new squashed commit with:
1885 `git log orig_parent..end_commit`.
1886 end_commit: The commit to use as the end of the new squashed commit.
1887 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001888
1889 if end_commit is None:
1890 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1891
Joanna Wang05b60342023-03-29 20:25:57 +00001892 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001893 end_commit)
1894 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1895 with gclient_utils.temporary_file() as desc_tempfile:
1896 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1897 commit_to_push = RunGit(
1898 ['commit-tree', latest_tree, '-p', parent, '-F',
1899 desc_tempfile]).strip()
1900
Joanna Wang7603f042023-03-01 22:17:36 +00001901 # Gerrit may or may not update fast enough to return the correct patchset
1902 # number after we push. Get the pre-upload patchset and increment later.
1903 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001904 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001905 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001906
Daniel Chengabf48472023-08-30 15:45:13 +00001907 def PrepareCherryPickSquashedCommit(self, options: optparse.Values,
1908 parent: str) -> _NewUpload:
Joanna Wange8523912023-01-21 02:05:40 +00001909 """Create a commit cherry-picked on parent to push."""
1910
Joanna Wang6215dd02023-02-07 15:58:03 +00001911 # The `parent` is what we will cherry-pick on top of.
1912 # The `cherry_pick_base` is the beginning range of what
1913 # we are cherry-picking.
1914 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1915 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001916 self.branchref)
1917
1918 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1919 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1920 with gclient_utils.temporary_file() as desc_tempfile:
1921 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001922 commit_to_cp = RunGit([
1923 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1924 desc_tempfile
1925 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001926
Joanna Wang6215dd02023-02-07 15:58:03 +00001927 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001928 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1929 if ret:
1930 RunGit(['cherry-pick', '--abort'])
1931 RunGit(['checkout', '-q', self.branch])
1932 DieWithError('Could not cleanly cherry-pick')
1933
Joanna Wang6215dd02023-02-07 15:58:03 +00001934 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001935 RunGit(['checkout', '-q', self.branch])
1936
Joanna Wang7603f042023-03-01 22:17:36 +00001937 # Gerrit may or may not update fast enough to return the correct patchset
1938 # number after we push. Get the pre-upload patchset and increment later.
1939 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001940 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001941 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001942
Daniel Chengabf48472023-08-30 15:45:13 +00001943 def _PrepareChange(
1944 self, options: optparse.Values, parent: str, end_commit: str
1945 ) -> Tuple[Sequence[str], Sequence[str], ChangeDescription]:
Joanna Wangb46232e2023-01-21 01:58:46 +00001946 """Prepares the change to be uploaded."""
1947 self.EnsureCanUploadPatchset(options.force)
1948
1949 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1950 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1951 files)
1952
1953 watchlist = watchlists.Watchlists(settings.GetRoot())
1954 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1955 if not options.bypass_hooks:
1956 hook_results = self.RunHook(committing=False,
1957 may_prompt=not options.force,
1958 verbose=options.verbose,
1959 parallel=options.parallel,
1960 upstream=parent,
1961 description=change_desc.description,
1962 all_files=False)
1963 self.ExtendCC(hook_results['more_cc'])
1964
1965 # Update the change description and ensure we have a Change Id.
1966 if self.GetIssue():
1967 if options.edit_description:
1968 change_desc.prompt()
1969 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1970 change_id = change_detail['change_id']
1971 change_desc.ensure_change_id(change_id)
1972
Joanna Wangb46232e2023-01-21 01:58:46 +00001973 else: # No change issue. First time uploading
1974 if not options.force and not options.message_file:
1975 change_desc.prompt()
1976
1977 # Check if user added a change_id in the descripiton.
1978 change_ids = git_footers.get_footer_change_id(change_desc.description)
1979 if len(change_ids) == 1:
1980 change_id = change_ids[0]
1981 else:
1982 change_id = GenerateGerritChangeId(change_desc.description)
1983 change_desc.ensure_change_id(change_id)
1984
1985 if options.preserve_tryjobs:
1986 change_desc.set_preserve_tryjobs()
1987
1988 SaveDescriptionBackup(change_desc)
1989
1990 # Add ccs
1991 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001992 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001993 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001994 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001995 ccs = self.GetCCList().split(',')
1996 if len(ccs) > 100:
1997 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1998 'process/lsc/lsc_workflow.md')
1999 print('WARNING: This will auto-CC %s users.' % len(ccs))
2000 print('LSC may be more appropriate: %s' % lsc)
2001 print('You can also use the --no-autocc flag to disable auto-CC.')
2002 confirm_or_exit(action='continue')
2003
2004 # Add ccs from the --cc flag.
2005 if options.cc:
2006 ccs.extend(options.cc)
2007
2008 ccs = [email.strip() for email in ccs if email.strip()]
2009 if change_desc.get_cced():
2010 ccs.extend(change_desc.get_cced())
2011
2012 return change_desc.get_reviewers(), ccs, change_desc
2013
Daniel Chengabf48472023-08-30 15:45:13 +00002014 def PostUploadUpdates(self, options: optparse.Values, new_upload: _NewUpload,
2015 change_number: str) -> None:
Joanna Wang40497912023-01-24 21:18:16 +00002016 """Makes necessary post upload changes to the local and remote cl."""
2017 if not self.GetIssue():
2018 self.SetIssue(change_number)
2019
Joanna Wang7603f042023-03-01 22:17:36 +00002020 self.SetPatchset(new_upload.prev_patchset + 1)
2021
Joanna Wang40497912023-01-24 21:18:16 +00002022 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
2023 new_upload.commit_to_push)
2024 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
2025 new_upload.new_last_uploaded_commit)
2026
2027 if settings.GetRunPostUploadHook():
2028 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00002029 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00002030
2031 if new_upload.reviewers or new_upload.ccs:
2032 gerrit_util.AddReviewers(self.GetGerritHost(),
2033 self._GerritChangeIdentifier(),
2034 reviewers=new_upload.reviewers,
2035 ccs=new_upload.ccs,
2036 notify=bool(options.send_mail))
2037
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002038 def CMDUpload(self, options, git_diff_args, orig_args):
2039 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002040 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002041 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002042 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002043 else:
2044 if self.GetBranch() is None:
2045 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
2046
2047 # Default to diffing against common ancestor of upstream branch
2048 base_branch = self.GetCommonAncestorWithUpstream()
2049 git_diff_args = [base_branch, 'HEAD']
2050
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002051 # Fast best-effort checks to abort before running potentially expensive
2052 # hooks if uploading is likely to fail anyway. Passing these checks does
2053 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00002054 self.EnsureAuthenticated(force=options.force)
2055 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002056
Daniel Cheng66d0f152023-08-29 23:21:58 +00002057 print(f'Processing {_GetCommitCountSummary(*git_diff_args)}...')
2058
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002059 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00002060 watchlist = watchlists.Watchlists(settings.GetRoot())
2061 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002062 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08002063 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002064
Edward Lemur5a644f82020-03-18 16:44:57 +00002065 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002066 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00002067 hook_results = self.RunHook(committing=False,
2068 may_prompt=not options.force,
2069 verbose=options.verbose,
2070 parallel=options.parallel,
2071 upstream=base_branch,
2072 description=change_desc.description,
2073 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00002074 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002075
Aaron Gable13101a62018-02-09 13:20:41 -08002076 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00002077 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00002078 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002079 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00002080 if self.GetBranch() is not None:
2081 self._GitSetBranchConfigValue(
2082 LAST_UPLOAD_HASH_CONFIG_KEY,
2083 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002084 # Run post upload hooks, if specified.
2085 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00002086 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00002087 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002088
2089 # Upload all dependencies if specified.
2090 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07002091 print()
2092 print('--dependencies has been specified.')
2093 print('All dependent local branches will be re-uploaded.')
2094 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002095 # Remove the dependencies flag from args so that we do not end up in a
2096 # loop.
2097 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00002098 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002099 return ret
2100
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002101 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002102 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002103
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00002104 Issue must have been already uploaded and known.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002105 """
2106 assert new_state in _CQState.ALL_STATES
2107 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07002108 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00002109 vote_map = {
2110 _CQState.NONE: 0,
2111 _CQState.DRY_RUN: 1,
2112 _CQState.COMMIT: 2,
2113 }
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00002114 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00002115 notify = False if new_state == _CQState.DRY_RUN else None
2116 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002117 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00002118 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07002119 return 0
2120 except KeyboardInterrupt:
2121 raise
2122 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002123 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07002124 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002125 ' * Your project has no CQ,\n'
2126 ' * You don\'t have permission to change the CQ state,\n'
2127 ' * There\'s a bug in this code (see stack trace below).\n'
2128 'Consider specifying which bots to trigger manually or asking your '
2129 'project owners for permissions or contacting Chrome Infra at:\n'
2130 'https://www.chromium.org/infra\n\n' %
2131 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07002132 # Still raise exception so that stack trace is printed.
2133 raise
2134
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002135 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002136 # Lazy load of configs.
2137 self.GetCodereviewServer()
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00002138
tandriie32e3ea2016-06-22 02:52:48 -07002139 if self._gerrit_host and '.' not in self._gerrit_host:
2140 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
Edward Lemur79d4f992019-11-11 23:49:02 +00002141 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07002142 if parsed.scheme == 'sso':
tandriie32e3ea2016-06-22 02:52:48 -07002143 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2144 self._gerrit_server = 'https://%s' % self._gerrit_host
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00002145
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002146 return self._gerrit_host
2147
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002148 def _GetGitHost(self):
2149 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00002150 remote_url = self.GetRemoteUrl()
2151 if not remote_url:
2152 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002153 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002154
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002155 def GetCodereviewServer(self):
2156 if not self._gerrit_server:
2157 # If we're on a branch then get the server potentially associated
2158 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00002159 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07002160 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00002161 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07002162 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00002163 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002164 if not self._gerrit_server:
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00002165 url = urllib.parse.urlparse(self.GetRemoteUrl())
2166 parts = url.netloc.split('.')
2167
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002168 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2169 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002170 parts[0] = parts[0] + '-review'
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00002171
2172 if url.scheme == 'sso' and len(parts) == 1:
2173 # sso:// uses abbreivated hosts, eg. sso://chromium instead of
2174 # chromium.googlesource.com. Hence, for code review server, they need
2175 # to be expanded.
2176 parts[0] += '.googlesource.com'
2177
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002178 self._gerrit_host = '.'.join(parts)
2179 self._gerrit_server = 'https://%s' % self._gerrit_host
2180 return self._gerrit_server
2181
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002182 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002183 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002184 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002185 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002186 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002187 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002188 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002189 if project.endswith('.git'):
2190 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002191 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2192 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2193 # gitiles/git-over-https protocol. E.g.,
2194 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2195 # as
2196 # https://chromium.googlesource.com/v8/v8
2197 if project.startswith('a/'):
2198 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002199 return project
2200
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002201 def _GerritChangeIdentifier(self):
2202 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2203
2204 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002205 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002206 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002207 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002208 if project:
2209 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2210 # Fall back on still unique, but less efficient change number.
2211 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002212
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002213 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002214 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002215 if settings.GetGerritSkipEnsureAuthenticated():
2216 # For projects with unusual authentication schemes.
2217 # See http://crbug.com/603378.
2218 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002219
2220 # Check presence of cookies only if using cookies-based auth method.
2221 cookie_auth = gerrit_util.Authenticator.get()
2222 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002223 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002224
Florian Mayerae510e82020-01-30 21:04:48 +00002225 remote_url = self.GetRemoteUrl()
2226 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002227 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002228 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002229 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2230 logging.warning(
2231 'Ignoring branch %(branch)s with non-https/sso remote '
2232 '%(remote)s', {
2233 'branch': self.branch,
2234 'remote': self.GetRemoteUrl()
2235 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002236 return
2237
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002238 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002239 self.GetCodereviewServer()
2240 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002241 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002242
2243 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2244 git_auth = cookie_auth.get_auth_header(git_host)
2245 if gerrit_auth and git_auth:
2246 if gerrit_auth == git_auth:
2247 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002248 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002249 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002250 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002251 ' %s\n'
2252 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002253 ' Consider running the following command:\n'
2254 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002255 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002256 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002257 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002258 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002259 cookie_auth.get_new_password_message(git_host)))
2260 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002261 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002262 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002263
2264 missing = (
2265 ([] if gerrit_auth else [self._gerrit_host]) +
2266 ([] if git_auth else [git_host]))
2267 DieWithError('Credentials for the following hosts are required:\n'
2268 ' %s\n'
2269 'These are read from %s (or legacy %s)\n'
2270 '%s' % (
2271 '\n '.join(missing),
2272 cookie_auth.get_gitcookies_path(),
2273 cookie_auth.get_netrc_path(),
2274 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002275
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002276 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002277 if not self.GetIssue():
2278 return
2279
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002280 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002281 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002282 DieWithError(
2283 'Change %s has been abandoned, new uploads are not allowed' %
2284 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002285 if status == 'MERGED':
2286 answer = gclient_utils.AskForData(
2287 'Change %s has been submitted, new uploads are not allowed. '
2288 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2289 ).lower()
2290 if answer not in ('y', ''):
2291 DieWithError('New uploads are not allowed.')
2292 self.SetIssue()
2293 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002294
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002295 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2296 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2297 # Apparently this check is not very important? Otherwise get_auth_email
2298 # could have been added to other implementations of Authenticator.
2299 cookies_auth = gerrit_util.Authenticator.get()
2300 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002301 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002302
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002303 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002304 if self.GetIssueOwner() == cookies_user:
2305 return
2306 logging.debug('change %s owner is %s, cookies user is %s',
2307 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002308 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002309 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002310 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002311 if details['email'] == self.GetIssueOwner():
2312 return
2313 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002314 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002315 'as %s.\n'
2316 'Uploading may fail due to lack of permissions.' %
2317 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2318 confirm_or_exit(action='upload')
2319
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002320 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002321 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002322 or CQ status, assuming adherence to a common workflow.
2323
2324 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002325 * 'error' - error from review tool (including deleted issues)
2326 * 'unsent' - no reviewers added
2327 * 'waiting' - waiting for review
2328 * 'reply' - waiting for uploader to reply to review
2329 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002330 * 'dry-run' - dry-running in the CQ
2331 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002332 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002333 """
2334 if not self.GetIssue():
2335 return None
2336
2337 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002338 data = self._GetChangeDetail([
2339 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002340 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002341 return 'error'
2342
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002343 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002344 return 'closed'
2345
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002346 cq_label = data['labels'].get('Commit-Queue', {})
2347 max_cq_vote = 0
2348 for vote in cq_label.get('all', []):
2349 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2350 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002351 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002352 if max_cq_vote == 1:
2353 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002354
Aaron Gable9ab38c62017-04-06 14:36:33 -07002355 if data['labels'].get('Code-Review', {}).get('approved'):
2356 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002357
2358 if not data.get('reviewers', {}).get('REVIEWER', []):
2359 return 'unsent'
2360
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002361 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002362 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002363 while messages:
2364 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002365 if (m.get('tag', '').startswith('autogenerated:cq') or
2366 m.get('tag', '').startswith('autogenerated:cv')):
2367 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002368 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002369 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002370 # Most recent message was by owner.
2371 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002372
2373 # Some reply from non-owner.
2374 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002375
2376 # Somehow there are no messages even though there are reviewers.
2377 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002378
Gavin Mak4e5e3992022-11-14 22:40:12 +00002379 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002380 if not self.GetIssue():
2381 return None
2382
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002383 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002384 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002385 if update:
2386 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002387 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002388
Gavin Makf35a9eb2022-11-17 18:34:36 +00002389 def _IsPatchsetRangeSignificant(self, lower, upper):
2390 """Returns True if the inclusive range of patchsets contains any reworks or
2391 rebases."""
2392 if not self.GetIssue():
2393 return False
2394
2395 data = self._GetChangeDetail(['ALL_REVISIONS'])
2396 ps_kind = {}
2397 for rev_info in data.get('revisions', {}).values():
2398 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2399
2400 for ps in range(lower, upper + 1):
2401 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2402 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2403 return True
2404 return False
2405
Gavin Make61ccc52020-11-13 00:12:57 +00002406 def GetMostRecentDryRunPatchset(self):
2407 """Get patchsets equivalent to the most recent patchset and return
2408 the patchset with the latest dry run. If none have been dry run, return
2409 the latest patchset."""
2410 if not self.GetIssue():
2411 return None
2412
2413 data = self._GetChangeDetail(['ALL_REVISIONS'])
2414 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002415 dry_run = {int(m['_revision_number'])
2416 for m in data.get('messages', [])
2417 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002418
2419 for revision_info in sorted(data.get('revisions', {}).values(),
2420 key=lambda c: c['_number'], reverse=True):
2421 if revision_info['_number'] in dry_run:
2422 patchset = revision_info['_number']
2423 break
2424 if revision_info.get('kind', '') not in \
2425 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2426 break
2427 self.SetPatchset(patchset)
2428 return patchset
2429
Aaron Gable636b13f2017-07-14 10:42:48 -07002430 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002431 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002432 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002433 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002434
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002435 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002436 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002437 # CURRENT_REVISION is included to get the latest patchset so that
2438 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002439 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002440 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2441 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002442 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002443 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002444 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002445 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002446
2447 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002448 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002449 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002450 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002451 line_comments = file_comments.setdefault(path, [])
2452 line_comments.extend(
2453 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002454
2455 # Build dictionary of file comments for easy access and sorting later.
2456 # {author+date: {path: {patchset: {line: url+message}}}}
2457 comments = collections.defaultdict(
2458 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002459
2460 server = self.GetCodereviewServer()
2461 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2462 # /c/ is automatically added by short URL server.
2463 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2464 self.GetIssue())
2465 else:
2466 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2467
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002468 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002469 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002470 tag = comment.get('tag', '')
2471 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002472 continue
2473 key = (comment['author']['email'], comment['updated'])
2474 if comment.get('side', 'REVISION') == 'PARENT':
2475 patchset = 'Base'
2476 else:
2477 patchset = 'PS%d' % comment['patch_set']
2478 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002479 url = ('%s/%s/%s#%s%s' %
2480 (url_prefix, comment['patch_set'], path,
2481 'b' if comment.get('side') == 'PARENT' else '',
2482 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002483 comments[key][path][patchset][line] = (url, comment['message'])
2484
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002485 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002486 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002487 summary = self._BuildCommentSummary(msg, comments, readable)
2488 if summary:
2489 summaries.append(summary)
2490 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002491
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002492 @staticmethod
2493 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002494 if 'email' not in msg['author']:
2495 # Some bot accounts may not have an email associated.
2496 return None
2497
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002498 key = (msg['author']['email'], msg['date'])
2499 # Don't bother showing autogenerated messages that don't have associated
2500 # file or line comments. this will filter out most autogenerated
2501 # messages, but will keep robot comments like those from Tricium.
2502 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2503 if is_autogenerated and not comments.get(key):
2504 return None
2505 message = msg['message']
2506 # Gerrit spits out nanoseconds.
2507 assert len(msg['date'].split('.')[-1]) == 9
2508 date = datetime.datetime.strptime(msg['date'][:-3],
2509 '%Y-%m-%d %H:%M:%S.%f')
2510 if key in comments:
2511 message += '\n'
2512 for path, patchsets in sorted(comments.get(key, {}).items()):
2513 if readable:
2514 message += '\n%s' % path
2515 for patchset, lines in sorted(patchsets.items()):
2516 for line, (url, content) in sorted(lines.items()):
2517 if line:
2518 line_str = 'Line %d' % line
2519 path_str = '%s:%d:' % (path, line)
2520 else:
2521 line_str = 'File comment'
2522 path_str = '%s:0:' % path
2523 if readable:
2524 message += '\n %s, %s: %s' % (patchset, line_str, url)
2525 message += '\n %s\n' % content
2526 else:
2527 message += '\n%s ' % path_str
2528 message += '\n%s\n' % content
2529
2530 return _CommentSummary(
2531 date=date,
2532 message=message,
2533 sender=msg['author']['email'],
2534 autogenerated=is_autogenerated,
2535 # These could be inferred from the text messages and correlated with
2536 # Code-Review label maximum, however this is not reliable.
2537 # Leaving as is until the need arises.
2538 approval=False,
2539 disapproval=False,
2540 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002541
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002542 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002543 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002544 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002545
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002546 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002547 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002548 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002549
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002550 def _GetChangeDetail(self, options=None):
2551 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002552 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002553 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002554
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002555 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002556 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002557 options.append('CURRENT_COMMIT')
2558
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002559 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002560 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002561 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002562
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002563 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2564 # Assumption: data fetched before with extra options is suitable
2565 # for return for a smaller set of options.
2566 # For example, if we cached data for
2567 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2568 # and request is for options=[CURRENT_REVISION],
2569 # THEN we can return prior cached data.
2570 if options_set.issubset(cached_options_set):
2571 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002572
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002573 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002574 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002575 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002576 except gerrit_util.GerritError as e:
2577 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002578 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002579 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002580
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002581 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002582 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002583
Gavin Mak4e5e3992022-11-14 22:40:12 +00002584 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002585 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002586 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002587 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2588 self._GerritChangeIdentifier(),
2589 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002590 except gerrit_util.GerritError as e:
2591 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002592 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002593 raise
agable32978d92016-11-01 12:55:02 -07002594 return data
2595
Karen Qian40c19422019-03-13 21:28:29 +00002596 def _IsCqConfigured(self):
2597 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002598 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002599
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002600 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002601 if git_common.is_dirty_git_tree('land'):
2602 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002603
tandriid60367b2016-06-22 05:25:12 -07002604 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002605 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002606 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002607 'which can test and land changes for you. '
2608 'Are you sure you wish to bypass it?\n',
2609 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002610 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002611 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002612 # Note: git diff outputs nothing if there is no diff.
2613 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002614 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002615 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002616 if detail['current_revision'] == last_upload:
2617 differs = False
2618 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002619 print('WARNING: Local branch contents differ from latest uploaded '
2620 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002621 if differs:
2622 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002623 confirm_or_exit(
2624 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2625 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002626 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002627 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002628 upstream = self.GetCommonAncestorWithUpstream()
2629 if self.GetIssue():
2630 description = self.FetchDescription()
2631 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002632 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002633 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002634 committing=True,
2635 may_prompt=not force,
2636 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002637 parallel=parallel,
2638 upstream=upstream,
2639 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002640 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002641 resultdb=resultdb,
2642 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002643
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002644 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002645 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002646 links = self._GetChangeCommit().get('web_links', [])
2647 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002648 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002649 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002650 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002651 return 0
2652
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002653 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2654 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002655 assert parsed_issue_arg.valid
2656
Edward Lemur125d60a2019-09-13 18:25:41 +00002657 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002658
2659 if parsed_issue_arg.hostname:
2660 self._gerrit_host = parsed_issue_arg.hostname
2661 self._gerrit_server = 'https://%s' % self._gerrit_host
2662
tandriic2405f52016-10-10 08:13:15 -07002663 try:
2664 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002665 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002666 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002667
2668 if not parsed_issue_arg.patchset:
2669 # Use current revision by default.
2670 revision_info = detail['revisions'][detail['current_revision']]
2671 patchset = int(revision_info['_number'])
2672 else:
2673 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002674 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002675 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2676 break
2677 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002678 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002679 (parsed_issue_arg.patchset, self.GetIssue()))
2680
Edward Lemur125d60a2019-09-13 18:25:41 +00002681 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002682 if remote_url.endswith('.git'):
2683 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002684 remote_url = remote_url.rstrip('/')
2685
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002686 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002687 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002688
2689 if remote_url != fetch_info['url']:
2690 DieWithError('Trying to patch a change from %s but this repo appears '
2691 'to be %s.' % (fetch_info['url'], remote_url))
2692
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002693 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002694
Joanna Wangc023a632023-01-26 17:59:25 +00002695 # Set issue immediately in case the cherry-pick fails, which happens
2696 # when resolving conflicts.
2697 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002698 self.SetIssue(parsed_issue_arg.issue)
2699
Aaron Gable62619a32017-06-16 08:22:09 -07002700 if force:
2701 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2702 print('Checked out commit for change %i patchset %i locally' %
2703 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002704 elif nocommit:
2705 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2706 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002707 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002708 RunGit(['cherry-pick', 'FETCH_HEAD'])
2709 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002710 (parsed_issue_arg.issue, patchset))
2711 print('Note: this created a local commit which does not have '
2712 'the same hash as the one uploaded for review. This will make '
2713 'uploading changes based on top of this branch difficult.\n'
2714 'If you want to do that, use "git cl patch --force" instead.')
2715
Stefan Zagerd08043c2017-10-12 12:07:02 -07002716 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002717 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002718 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002719 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2720 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002721 else:
2722 print('WARNING: You are in detached HEAD state.\n'
2723 'The patch has been applied to your checkout, but you will not be '
2724 'able to upload a new patch set to the gerrit issue.\n'
2725 'Try using the \'-b\' option if you would like to work on a '
2726 'branch and/or upload a new patch set.')
2727
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002728 return 0
2729
Joanna Wang18de1f62023-01-21 01:24:24 +00002730 @staticmethod
2731 def _GerritCommitMsgHookCheck(offer_removal):
2732 # type: (bool) -> None
2733 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002734 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2735 if not os.path.exists(hook):
2736 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002737 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2738 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002739 data = gclient_utils.FileRead(hook)
2740 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2741 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002742 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002743 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002744 'and may interfere with it in subtle ways.\n'
2745 'We recommend you remove the commit-msg hook.')
2746 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002747 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002748 gclient_utils.rm_file_or_tree(hook)
2749 print('Gerrit commit-msg hook removed.')
2750 else:
2751 print('OK, will keep Gerrit commit-msg hook in place.')
2752
Edward Lemur1b52d872019-05-09 21:12:12 +00002753 def _CleanUpOldTraces(self):
2754 """Keep only the last |MAX_TRACES| traces."""
2755 try:
2756 traces = sorted([
2757 os.path.join(TRACES_DIR, f)
2758 for f in os.listdir(TRACES_DIR)
2759 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2760 and not f.startswith('tmp'))
2761 ])
2762 traces_to_delete = traces[:-MAX_TRACES]
2763 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002764 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002765 except OSError:
2766 print('WARNING: Failed to remove old git traces from\n'
2767 ' %s'
2768 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002769
Edward Lemur5737f022019-05-17 01:24:00 +00002770 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002771 """Zip and write the git push traces stored in traces_dir."""
2772 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002773 traces_zip = trace_name + '-traces'
2774 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002775 # Create a temporary dir to store git config and gitcookies in. It will be
2776 # compressed and stored next to the traces.
2777 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002778 git_info_zip = trace_name + '-git-info'
2779
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002780 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002781
Edward Lemur1b52d872019-05-09 21:12:12 +00002782 git_push_metadata['trace_name'] = trace_name
2783 gclient_utils.FileWrite(
2784 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2785
2786 # Keep only the first 6 characters of the git hashes on the packet
2787 # trace. This greatly decreases size after compression.
2788 packet_traces = os.path.join(traces_dir, 'trace-packet')
2789 if os.path.isfile(packet_traces):
2790 contents = gclient_utils.FileRead(packet_traces)
2791 gclient_utils.FileWrite(
2792 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2793 shutil.make_archive(traces_zip, 'zip', traces_dir)
2794
2795 # Collect and compress the git config and gitcookies.
2796 git_config = RunGit(['config', '-l'])
2797 gclient_utils.FileWrite(
2798 os.path.join(git_info_dir, 'git-config'),
2799 git_config)
2800
2801 cookie_auth = gerrit_util.Authenticator.get()
2802 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2803 gitcookies_path = cookie_auth.get_gitcookies_path()
2804 if os.path.isfile(gitcookies_path):
2805 gitcookies = gclient_utils.FileRead(gitcookies_path)
2806 gclient_utils.FileWrite(
2807 os.path.join(git_info_dir, 'gitcookies'),
2808 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2809 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2810
Edward Lemur1b52d872019-05-09 21:12:12 +00002811 gclient_utils.rmtree(git_info_dir)
2812
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002813 def _RunGitPushWithTraces(self,
2814 refspec,
2815 refspec_opts,
2816 git_push_metadata,
2817 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002818 """Run git push and collect the traces resulting from the execution."""
2819 # Create a temporary directory to store traces in. Traces will be compressed
2820 # and stored in a 'traces' dir inside depot_tools.
2821 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002822 trace_name = os.path.join(
2823 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002824
2825 env = os.environ.copy()
2826 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2827 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002828 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002829 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2830 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2831 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2832
Daniel Chengabf48472023-08-30 15:45:13 +00002833 push_returncode = 0
2834 before_push = time_time()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002835 try:
Edward Lemur1b52d872019-05-09 21:12:12 +00002836 remote_url = self.GetRemoteUrl()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002837 push_cmd = ['git', 'push', remote_url, refspec]
2838 if git_push_options:
2839 for opt in git_push_options:
2840 push_cmd.extend(['-o', opt])
2841
Edward Lemur0f58ae42019-04-30 17:24:12 +00002842 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002843 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002844 env=env,
2845 print_stdout=True,
2846 # Flush after every line: useful for seeing progress when running as
2847 # recipe.
2848 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002849 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002850 except subprocess2.CalledProcessError as e:
2851 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002852 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002853 raise GitPushError(
2854 'Failed to create a change, very likely due to blocked keyword. '
2855 'Please examine output above for the reason of the failure.\n'
2856 'If this is a false positive, you can try to bypass blocked '
2857 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002858 '-o banned-words~skip, e.g.:\n'
2859 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002860 'If git-cl is not working correctly, file a bug under the '
2861 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002862 if 'git push -o nokeycheck' in str(e.stdout):
2863 raise GitPushError(
2864 'Failed to create a change, very likely due to a private key being '
2865 'detected. Please examine output above for the reason of the '
2866 'failure.\n'
2867 'If this is a false positive, you can try to bypass private key '
2868 'detection by using push option '
2869 '-o nokeycheck, e.g.:\n'
2870 'git cl upload -o nokeycheck\n\n'
2871 'If git-cl is not working correctly, file a bug under the '
2872 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002873
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002874 raise GitPushError(
2875 'Failed to create a change. Please examine output above for the '
2876 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002877 'For emergencies, Googlers can escalate to '
2878 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002879 'Hint: run command below to diagnose common Git/Gerrit '
2880 'credential problems:\n'
2881 ' git cl creds-check\n'
2882 '\n'
2883 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2884 'component including the files below.\n'
2885 'Review the files before upload, since they might contain sensitive '
2886 'information.\n'
2887 'Set the Restrict-View-Google label so that they are not publicly '
2888 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002889 finally:
2890 execution_time = time_time() - before_push
2891 metrics.collector.add_repeated('sub_commands', {
2892 'command': 'git push',
2893 'execution_time': execution_time,
2894 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002895 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002896 })
2897
Edward Lemur1b52d872019-05-09 21:12:12 +00002898 git_push_metadata['execution_time'] = execution_time
2899 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002900 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002901
Edward Lemur1b52d872019-05-09 21:12:12 +00002902 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002903 gclient_utils.rmtree(traces_dir)
2904
2905 return push_stdout
2906
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002907 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2908 change_desc):
2909 """Upload the current branch to Gerrit, retry if new remote HEAD is
2910 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002911 remote, remote_branch = self.GetRemoteBranch()
2912 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2913
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002914 try:
2915 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002916 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002917 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002918 # Repository might be in the middle of transition to main branch as
2919 # default, and uploads to old default might be blocked.
2920 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002921 DieWithError(str(e), change_desc)
2922
Josip Sokcevicb631a882021-01-06 18:18:10 +00002923 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2924 self.GetGerritProject())
2925 if project_head == branch:
2926 DieWithError(str(e), change_desc)
2927 branch = project_head
2928
2929 print("WARNING: Fetching remote state and retrying upload to default "
2930 "branch...")
2931 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002932 options.edit_description = False
2933 options.force = True
2934 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002935 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2936 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002937 except GitPushError as e:
2938 DieWithError(str(e), change_desc)
2939
2940 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002941 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002942 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002943 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002944 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002945 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002947 # User requested to change description
2948 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002949 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002950 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2951 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002952 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002953
2954 # Check if changes outside of this workspace have been uploaded.
2955 current_rev = change_detail['current_revision']
2956 last_uploaded_rev = self._GitGetBranchConfigValue(
2957 GERRIT_SQUASH_HASH_CONFIG_KEY)
2958 if last_uploaded_rev and current_rev != last_uploaded_rev:
2959 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002960 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002961 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002962 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002963 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002964 if len(change_ids) == 1:
2965 change_id = change_ids[0]
2966 else:
2967 change_id = GenerateGerritChangeId(change_desc.description)
2968 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002969
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002970 if options.preserve_tryjobs:
2971 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002972
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002973 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002974 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002975 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002976 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002977 with gclient_utils.temporary_file() as desc_tempfile:
2978 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2979 ref_to_push = RunGit(
2980 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002981 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002982 if options.no_add_changeid:
2983 pass
2984 else: # adding Change-Ids is okay.
2985 if not git_footers.get_footer_change_id(change_desc.description):
2986 DownloadGerritHook(False)
2987 change_desc.set_description(
2988 self._AddChangeIdToCommitMessage(change_desc.description,
2989 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002991 # For no-squash mode, we assume the remote called "origin" is the one we
2992 # want. It is not worthwhile to support different workflows for
2993 # no-squash mode.
2994 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002995 # attempt to extract the changeid from the current description
2996 # fail informatively if not possible.
2997 change_id_candidates = git_footers.get_footer_change_id(
2998 change_desc.description)
2999 if not change_id_candidates:
3000 DieWithError("Unable to extract change-id from message.")
3001 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003002
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00003003 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003004 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3005 ref_to_push)]).splitlines()
3006 if len(commits) > 1:
3007 print('WARNING: This will upload %d commits. Run the following command '
3008 'to see which commits will be uploaded: ' % len(commits))
3009 print('git log %s..%s' % (parent, ref_to_push))
3010 print('You can also use `git squash-branch` to squash these into a '
3011 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003012 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003013
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003014 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00003015 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00003016 # Add default, watchlist, presubmit ccs if this is the initial upload
3017 # and CL is not private and auto-ccing has not been disabled.
3018 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003019 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00003020 if len(cc) > 100:
3021 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
3022 'process/lsc/lsc_workflow.md')
3023 print('WARNING: This will auto-CC %s users.' % len(cc))
3024 print('LSC may be more appropriate: %s' % lsc)
3025 print('You can also use the --no-autocc flag to disable auto-CC.')
3026 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00003027 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003028 if options.cc:
3029 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00003030 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003031 if change_desc.get_cced():
3032 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00003033 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00003034 valid_accounts = set(reviewers + cc)
3035 # TODO(crbug/877717): relax this for all hosts.
3036 else:
3037 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00003038 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00003039 logging.info('accounts %s are recognized, %s invalid',
3040 sorted(valid_accounts),
3041 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003042
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003043 # Extra options that can be specified at push time. Doc:
3044 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00003045 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07003046
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003047 for r in sorted(reviewers):
3048 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00003049 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003050 reviewers.remove(r)
3051 else:
3052 # TODO(tandrii): this should probably be a hard failure.
3053 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
3054 % r)
3055 for c in sorted(cc):
3056 # refspec option will be rejected if cc doesn't correspond to an
3057 # account, even though REST call to add such arbitrary cc may succeed.
3058 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00003059 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003060 cc.remove(c)
3061
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00003062 refspec_suffix = ''
3063 if refspec_opts:
3064 refspec_suffix = '%' + ','.join(refspec_opts)
3065 assert ' ' not in refspec_suffix, (
3066 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3067 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003068
Edward Lemur1b52d872019-05-09 21:12:12 +00003069 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00003070 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00003071 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00003072 'change_id': change_id,
3073 'description': change_desc.description,
3074 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00003075
Gavin Mak4e5e3992022-11-14 22:40:12 +00003076 # Gerrit may or may not update fast enough to return the correct patchset
3077 # number after we push. Get the pre-upload patchset and increment later.
3078 latest_ps = self.GetMostRecentPatchset(update=False) or 0
3079
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00003080 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00003081 git_push_metadata,
3082 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003083
3084 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003085 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003086 change_numbers = [m.group(1)
3087 for m in map(regex.match, push_stdout.splitlines())
3088 if m]
3089 if len(change_numbers) != 1:
3090 DieWithError(
3091 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003092 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003093 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00003094 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00003095 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003096
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003097 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003098 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00003099 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00003100 gerrit_util.AddReviewers(self.GetGerritHost(),
3101 self._GerritChangeIdentifier(),
3102 reviewers,
3103 cc,
3104 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003105
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003106 return 0
3107
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003108 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3109 change_desc):
3110 """Computes parent of the generated commit to be uploaded to Gerrit.
3111
3112 Returns revision or a ref name.
3113 """
3114 if custom_cl_base:
3115 # Try to avoid creating additional unintended CLs when uploading, unless
3116 # user wants to take this risk.
3117 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3118 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3119 local_ref_of_target_remote])
3120 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003121 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003122 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3123 'If you proceed with upload, more than 1 CL may be created by '
3124 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3125 'If you are certain that specified base `%s` has already been '
3126 'uploaded to Gerrit as another CL, you may proceed.\n' %
3127 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3128 if not force:
3129 confirm_or_exit(
3130 'Do you take responsibility for cleaning up potential mess '
3131 'resulting from proceeding with upload?',
3132 action='upload')
3133 return custom_cl_base
3134
Aaron Gablef97e33d2017-03-30 15:44:27 -07003135 if remote != '.':
3136 return self.GetCommonAncestorWithUpstream()
3137
3138 # If our upstream branch is local, we base our squashed commit on its
3139 # squashed version.
3140 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3141
Aaron Gablef97e33d2017-03-30 15:44:27 -07003142 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003143 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00003144 if upstream_branch_name == 'main':
3145 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003146
3147 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003148 # TODO(tandrii): consider checking parent change in Gerrit and using its
3149 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3150 # the tree hash of the parent branch. The upside is less likely bogus
3151 # requests to reupload parent change just because it's uploadhash is
3152 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00003153 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
3154 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07003155 # Verify that the upstream branch has been uploaded too, otherwise
3156 # Gerrit will create additional CLs when uploading.
3157 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3158 RunGitSilent(['rev-parse', parent + ':'])):
3159 DieWithError(
3160 '\nUpload upstream branch %s first.\n'
3161 'It is likely that this branch has been rebased since its last '
3162 'upload, so you just need to upload it again.\n'
3163 '(If you uploaded it with --no-squash, then branch dependencies '
3164 'are not supported, and you should reupload with --squash.)'
3165 % upstream_branch_name,
3166 change_desc)
3167 return parent
3168
Gavin Mak4e5e3992022-11-14 22:40:12 +00003169 def _UpdateWithExternalChanges(self):
3170 """Updates workspace with external changes.
3171
3172 Returns the commit hash that should be used as the merge base on upload.
3173 """
3174 local_ps = self.GetPatchset()
3175 if local_ps is None:
3176 return
3177
3178 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00003179 if external_ps is None or local_ps == external_ps or \
3180 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003181 return
3182
3183 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00003184 if num_changes > 1:
3185 change_words = 'changes were'
3186 else:
3187 change_words = 'change was'
3188 print('\n%d external %s published to %s:\n' %
3189 (num_changes, change_words, self.GetIssueURL(short=True)))
3190
3191 # Print an overview of external changes.
3192 ps_to_commit = {}
3193 ps_to_info = {}
3194 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
3195 for commit_id, revision_info in revisions.get('revisions', {}).items():
3196 ps_num = revision_info['_number']
3197 ps_to_commit[ps_num] = commit_id
3198 ps_to_info[ps_num] = revision_info
3199
3200 for ps in range(external_ps, local_ps, -1):
3201 commit = ps_to_commit[ps][:8]
3202 desc = ps_to_info[ps].get('description', '')
3203 print('Patchset %d [%s] %s' % (ps, commit, desc))
3204
Josip Sokcevic43ceaf02023-05-25 15:56:00 +00003205 print('\nSee diff at: %s/%d..%d' %
3206 (self.GetIssueURL(short=True), local_ps, external_ps))
3207 print('\nUploading without applying patches will override them.')
3208
3209 if not ask_for_explicit_yes('Get the latest changes and apply on top?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003210 return
3211
3212 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3213 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3214 external_base = external_parent['commit']
3215
3216 branch = git_common.current_branch()
3217 local_base = self.GetCommonAncestorWithUpstream()
3218 if local_base != external_base:
3219 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3220 (local_base, external_base))
3221 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00003222 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3223 'Continue with upload and override the latest changes?')
3224 return
3225 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003226
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003227 external_parent_last_uploaded = self._GetChangeCommit(
3228 revision=local_ps)['parents'][0]
3229 external_base_last_uploaded = external_parent_last_uploaded['commit']
3230
3231 if external_base != external_base_last_uploaded:
3232 print('\nPatch set merge bases are different (%s, %s).\n' %
3233 (external_base_last_uploaded, external_base))
3234 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3235 'Continue with upload and override the latest changes?')
3236 return
3237
Gavin Mak4e5e3992022-11-14 22:40:12 +00003238 # Fetch Gerrit's CL base if it doesn't exist locally.
3239 remote, _ = self.GetRemoteBranch()
3240 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3241 RunGitSilent(['fetch', remote, external_base])
3242
3243 # Get the diff between local_ps and external_ps.
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003244 print('Fetching changes...')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003245 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003246 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003247 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3248 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3249 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3250 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003251
3252 # If the commit parents are different, don't apply the diff as it very
3253 # likely contains many more changes not relevant to this CL.
3254 parents = RunGitSilent(
3255 ['rev-parse',
3256 '%s~1' % (last_uploaded),
3257 '%s~1' % (latest_external)]).strip().split()
3258 assert len(parents) == 2, 'Expected two parents.'
3259 if parents[0] != parents[1]:
3260 confirm_or_exit(
3261 'Can\'t apply the latest changes from Gerrit (parent mismatch '
3262 'between PS).\n'
3263 'Continue with upload and override the latest changes?')
3264 return
3265
Gavin Mak4e5e3992022-11-14 22:40:12 +00003266 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3267
3268 # Diff can be empty in the case of trivial rebases.
3269 if not diff:
3270 return external_base
3271
3272 # Apply the diff.
3273 with gclient_utils.temporary_file() as diff_tempfile:
3274 gclient_utils.FileWrite(diff_tempfile, diff)
3275 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3276 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3277 if not clean_patch:
3278 # Normally patchset is set after upload. But because we exit, that never
3279 # happens. Updating here makes sure that subsequent uploads don't need
3280 # to fetch/apply the same diff again.
3281 self.SetPatchset(external_ps)
3282 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3283 'conflicts and reupload.')
3284
3285 message = 'Incorporate external changes from '
3286 if num_changes == 1:
3287 message += 'patchset %d' % external_ps
3288 else:
3289 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3290 RunGitSilent(['commit', '-am', message])
3291 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3292 # patchset title instead of this 'Incorporate' message.
3293 return external_base
3294
Edward Lemura12175c2020-03-09 16:58:26 +00003295 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003296 """Re-commits using the current message, assumes the commit hook is in
3297 place.
3298 """
Edward Lemura12175c2020-03-09 16:58:26 +00003299 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003300 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003301 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003302 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003303 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003304
3305 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003306
tandriie113dfd2016-10-11 10:20:12 -07003307 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003308 try:
3309 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003310 except GerritChangeNotExists:
3311 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003312
3313 if data['status'] in ('ABANDONED', 'MERGED'):
3314 return 'CL %s is closed' % self.GetIssue()
3315
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003316 def GetGerritChange(self, patchset=None):
3317 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003318 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003319 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003320 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003321 data = self._GetChangeDetail(['ALL_REVISIONS'])
3322
3323 assert host and issue and patchset, 'CL must be uploaded first'
3324
3325 has_patchset = any(
3326 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003327 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003328 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003329 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003330 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003331
tandrii8c5a3532016-11-04 07:52:02 -07003332 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003333 'host': host,
3334 'change': issue,
3335 'project': data['project'],
3336 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003337 }
tandriie113dfd2016-10-11 10:20:12 -07003338
tandriide281ae2016-10-12 06:02:30 -07003339 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003340 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003341
Edward Lemur707d70b2018-02-07 00:50:14 +01003342 def GetReviewers(self):
3343 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003344 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003345
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003346
Lei Zhang8a0efc12020-08-05 19:58:45 +00003347def _get_bug_line_values(default_project_prefix, bugs):
3348 """Given default_project_prefix and comma separated list of bugs, yields bug
3349 line values.
tandriif9aefb72016-07-01 09:06:51 -07003350
3351 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003352 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003353 * string, which is left as is.
3354
3355 This function may produce more than one line, because bugdroid expects one
3356 project per line.
3357
Lei Zhang8a0efc12020-08-05 19:58:45 +00003358 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003359 ['v8:123', 'chromium:789']
3360 """
3361 default_bugs = []
3362 others = []
3363 for bug in bugs.split(','):
3364 bug = bug.strip()
3365 if bug:
3366 try:
3367 default_bugs.append(int(bug))
3368 except ValueError:
3369 others.append(bug)
3370
3371 if default_bugs:
3372 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003373 if default_project_prefix:
3374 if not default_project_prefix.endswith(':'):
3375 default_project_prefix += ':'
3376 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003377 else:
3378 yield default_bugs
3379 for other in sorted(others):
3380 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3381 yield other
3382
3383
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003384def FindCodereviewSettingsFile(filename='codereview.settings'):
3385 """Finds the given file starting in the cwd and going up.
3386
3387 Only looks up to the top of the repository unless an
3388 'inherit-review-settings-ok' file exists in the root of the repository.
3389 """
3390 inherit_ok_file = 'inherit-review-settings-ok'
3391 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003392 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003393 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003394 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003395 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003396 if os.path.isfile(os.path.join(cwd, filename)):
3397 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003398 if cwd == root:
3399 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003400 parent_dir = os.path.dirname(cwd)
3401 if parent_dir == cwd:
3402 # We hit the system root directory.
3403 break
3404 cwd = parent_dir
3405 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406
3407
3408def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003409 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003410 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003411
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003412 def SetProperty(name, setting, unset_error_ok=False):
3413 fullname = 'rietveld.' + name
3414 if setting in keyvals:
3415 RunGit(['config', fullname, keyvals[setting]])
3416 else:
3417 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3418
tandrii48df5812016-10-17 03:55:37 -07003419 if not keyvals.get('GERRIT_HOST', False):
3420 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003421 # Only server setting is required. Other settings can be absent.
3422 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003423 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003424 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3425 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003426 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003427 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3428 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003429 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3430 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003431 SetProperty(
3432 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003433
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003434 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003435 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003436
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003437 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003438 RunGit(['config', 'gerrit.squash-uploads',
3439 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003440
tandrii@chromium.org28253532016-04-14 13:46:56 +00003441 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003442 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003443 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3444
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003445 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003446 # should be of the form
3447 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3448 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003449 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3450 keyvals['ORIGIN_URL_CONFIG']])
3451
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003453def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003454 """Downloads a network object to a local file, like urllib.urlretrieve.
3455
3456 This is necessary because urllib is broken for SSL connections via a proxy.
3457 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003458 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003459 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003460
3461
ukai@chromium.org712d6102013-11-27 00:52:58 +00003462def hasSheBang(fname):
3463 """Checks fname is a #! script."""
3464 with open(fname) as f:
3465 return f.read(2).startswith('#!')
3466
3467
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003468def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003469 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470
3471 Args:
3472 force: True to update hooks. False to install hooks if not present.
3473 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003474 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003475 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3476 if not os.access(dst, os.X_OK):
3477 if os.path.exists(dst):
3478 if not force:
3479 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003480 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003481 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003482 if not hasSheBang(dst):
3483 DieWithError('Not a script: %s\n'
3484 'You need to download from\n%s\n'
3485 'into .git/hooks/commit-msg and '
3486 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003487 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3488 except Exception:
3489 if os.path.exists(dst):
3490 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003491 DieWithError('\nFailed to download hooks.\n'
3492 'You need to download from\n%s\n'
3493 'into .git/hooks/commit-msg and '
3494 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003495
3496
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003497class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003498 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003499
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003500 def __init__(self):
3501 # Cached list of [host, identity, source], where source is either
3502 # .gitcookies or .netrc.
3503 self._all_hosts = None
3504
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003505 def ensure_configured_gitcookies(self):
3506 """Runs checks and suggests fixes to make git use .gitcookies from default
3507 path."""
3508 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3509 configured_path = RunGitSilent(
3510 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003511 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003512 if configured_path:
3513 self._ensure_default_gitcookies_path(configured_path, default)
3514 else:
3515 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003516
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003517 @staticmethod
3518 def _ensure_default_gitcookies_path(configured_path, default_path):
3519 assert configured_path
3520 if configured_path == default_path:
3521 print('git is already configured to use your .gitcookies from %s' %
3522 configured_path)
3523 return
3524
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003525 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003526 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3527 (configured_path, default_path))
3528
3529 if not os.path.exists(configured_path):
3530 print('However, your configured .gitcookies file is missing.')
3531 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3532 action='reconfigure')
3533 RunGit(['config', '--global', 'http.cookiefile', default_path])
3534 return
3535
3536 if os.path.exists(default_path):
3537 print('WARNING: default .gitcookies file already exists %s' %
3538 default_path)
3539 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3540 default_path)
3541
3542 confirm_or_exit('Move existing .gitcookies to default location?',
3543 action='move')
3544 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003545 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003546 print('Moved and reconfigured git to use .gitcookies from %s' %
3547 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003548
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003549 @staticmethod
3550 def _configure_gitcookies_path(default_path):
3551 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3552 if os.path.exists(netrc_path):
3553 print('You seem to be using outdated .netrc for git credentials: %s' %
3554 netrc_path)
3555 print('This tool will guide you through setting up recommended '
3556 '.gitcookies store for git credentials.\n'
3557 '\n'
3558 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3559 ' git config --global --unset http.cookiefile\n'
3560 ' mv %s %s.backup\n\n' % (default_path, default_path))
3561 confirm_or_exit(action='setup .gitcookies')
3562 RunGit(['config', '--global', 'http.cookiefile', default_path])
3563 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003564
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003565 def get_hosts_with_creds(self, include_netrc=False):
3566 if self._all_hosts is None:
3567 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003568 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3569 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3570 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3571 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003572
3573 if include_netrc:
3574 return self._all_hosts
3575 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3576
3577 def print_current_creds(self, include_netrc=False):
3578 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3579 if not hosts:
3580 print('No Git/Gerrit credentials found')
3581 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003582 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003583 header = [('Host', 'User', 'Which file'),
3584 ['=' * l for l in lengths]]
3585 for row in (header + hosts):
3586 print('\t'.join((('%%+%ds' % l) % s)
3587 for l, s in zip(lengths, row)))
3588
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003589 @staticmethod
3590 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003591 """Parses identity "git-<username>.domain" into <username> and domain."""
3592 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003593 # distinguishable from sub-domains. But we do know typical domains:
3594 if identity.endswith('.chromium.org'):
3595 domain = 'chromium.org'
3596 username = identity[:-len('.chromium.org')]
3597 else:
3598 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003599 if username.startswith('git-'):
3600 username = username[len('git-'):]
3601 return username, domain
3602
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003603 def has_generic_host(self):
3604 """Returns whether generic .googlesource.com has been configured.
3605
3606 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3607 """
3608 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003609 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003610 return True
3611 return False
3612
3613 def _get_git_gerrit_identity_pairs(self):
3614 """Returns map from canonic host to pair of identities (Git, Gerrit).
3615
3616 One of identities might be None, meaning not configured.
3617 """
3618 host_to_identity_pairs = {}
3619 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003620 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003621 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3622 idx = 0 if canonical == host else 1
3623 pair[idx] = identity
3624 return host_to_identity_pairs
3625
3626 def get_partially_configured_hosts(self):
3627 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003628 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003629 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003630 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003631
3632 def get_conflicting_hosts(self):
3633 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003635 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003636 if None not in (i1, i2) and i1 != i2)
3637
3638 def get_duplicated_hosts(self):
3639 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003640 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003641
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003642
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003644 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003645 hosts = sorted(hosts)
3646 assert hosts
3647 if extra_column_func is None:
3648 extras = [''] * len(hosts)
3649 else:
3650 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003651 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3652 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003653 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003654 lines.append(tmpl % he)
3655 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003656
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003658 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 yield ('.googlesource.com wildcard record detected',
3660 ['Chrome Infrastructure team recommends to list full host names '
3661 'explicitly.'],
3662 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003663
3664 dups = self.get_duplicated_hosts()
3665 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 yield ('The following hosts were defined twice',
3667 self._format_hosts(dups),
3668 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003669
3670 partial = self.get_partially_configured_hosts()
3671 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003672 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3673 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003674 self._format_hosts(
3675 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3676 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003677
3678 conflicting = self.get_conflicting_hosts()
3679 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003680 yield ('The following Git hosts have differing credentials from their '
3681 'Gerrit counterparts',
3682 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3683 tuple(self._get_git_gerrit_identity_pairs()[host])),
3684 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003685
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003686 def find_and_report_problems(self):
3687 """Returns True if there was at least one problem, else False."""
3688 found = False
3689 bad_hosts = set()
3690 for title, sublines, hosts in self._find_problems():
3691 if not found:
3692 found = True
3693 print('\n\n.gitcookies problem report:\n')
3694 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003695 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003696 if sublines:
3697 print()
3698 print(' %s' % '\n '.join(sublines))
3699 print()
3700
3701 if bad_hosts:
3702 assert found
3703 print(' You can manually remove corresponding lines in your %s file and '
3704 'visit the following URLs with correct account to generate '
3705 'correct credential lines:\n' %
3706 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003707 print(' %s' % '\n '.join(
3708 sorted(
3709 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3710 _canonical_git_googlesource_host(host))
3711 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003712 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003713
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003714
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003715@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003716def CMDcreds_check(parser, args):
3717 """Checks credentials and suggests changes."""
3718 _, _ = parser.parse_args(args)
3719
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003720 # Code below checks .gitcookies. Abort if using something else.
3721 authn = gerrit_util.Authenticator.get()
3722 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003723 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003724 'This command is not designed for bot environment. It checks '
3725 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003726 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3727 if isinstance(authn, gerrit_util.GceAuthenticator):
3728 message += (
3729 '\n'
3730 'If you need to run this on GCE or a cloudtop instance, '
3731 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3732 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003733
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003734 checker = _GitCookiesChecker()
3735 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003736
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003737 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003738 checker.print_current_creds(include_netrc=True)
3739
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003740 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003741 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003742 return 0
3743 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003744
3745
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003746@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003747def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003748 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003749 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003750 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003751 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003752 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003754 return RunGit(['config', 'branch.%s.base-url' % branch],
3755 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003756
3757 print('Setting base-url to %s' % args[0])
3758 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3759 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003760
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003761
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003762def color_for_status(status):
3763 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003764 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003765 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003766 'unsent': BOLD + Fore.YELLOW,
3767 'waiting': BOLD + Fore.RED,
3768 'reply': BOLD + Fore.YELLOW,
3769 'not lgtm': BOLD + Fore.RED,
3770 'lgtm': BOLD + Fore.GREEN,
3771 'commit': BOLD + Fore.MAGENTA,
3772 'closed': BOLD + Fore.CYAN,
3773 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003774 }.get(status, Fore.WHITE)
3775
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003776
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003777def get_cl_statuses(changes, fine_grained, max_processes=None):
3778 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003779
3780 If fine_grained is true, this will fetch CL statuses from the server.
3781 Otherwise, simply indicate if there's a matching url for the given branches.
3782
3783 If max_processes is specified, it is used as the maximum number of processes
3784 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3785 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003786
3787 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003788 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003789 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003790 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003791
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003792 if not fine_grained:
3793 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003794 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003795 for cl in changes:
3796 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003797 return
3798
3799 # First, sort out authentication issues.
3800 logging.debug('ensuring credentials exist')
3801 for cl in changes:
3802 cl.EnsureAuthenticated(force=False, refresh=True)
3803
3804 def fetch(cl):
3805 try:
3806 return (cl, cl.GetStatus())
3807 except:
3808 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003809 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003810 raise
3811
3812 threads_count = len(changes)
3813 if max_processes:
3814 threads_count = max(1, min(threads_count, max_processes))
3815 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3816
Edward Lemur61bf4172020-02-24 23:22:37 +00003817 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003818 fetched_cls = set()
3819 try:
3820 it = pool.imap_unordered(fetch, changes).__iter__()
3821 while True:
3822 try:
3823 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003824 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003825 break
3826 fetched_cls.add(cl)
3827 yield cl, status
3828 finally:
3829 pool.close()
3830
3831 # Add any branches that failed to fetch.
3832 for cl in set(changes) - fetched_cls:
3833 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003834
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835
Jose Lopes3863fc52020-04-07 17:00:25 +00003836def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003837 """Uploads CLs of local branches that are dependents of the current branch.
3838
3839 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003840
3841 test1 -> test2.1 -> test3.1
3842 -> test3.2
3843 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844
3845 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3846 run on the dependent branches in this order:
3847 test2.1, test3.1, test3.2, test2.2, test3.3
3848
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003849 Note: This function does not rebase your local dependent branches. Use it
3850 when you make a change to the parent branch that will not conflict
3851 with its dependent branches, and you would like their dependencies
3852 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003853 """
3854 if git_common.is_dirty_git_tree('upload-branch-deps'):
3855 return 1
3856
3857 root_branch = cl.GetBranch()
3858 if root_branch is None:
3859 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3860 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003861 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003862 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3863 'patchset dependencies without an uploaded CL.')
3864
3865 branches = RunGit(['for-each-ref',
3866 '--format=%(refname:short) %(upstream:short)',
3867 'refs/heads'])
3868 if not branches:
3869 print('No local branches found.')
3870 return 0
3871
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003872 # Create a dictionary of all local branches to the branches that are
3873 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003874 tracked_to_dependents = collections.defaultdict(list)
3875 for b in branches.splitlines():
3876 tokens = b.split()
3877 if len(tokens) == 2:
3878 branch_name, tracked = tokens
3879 tracked_to_dependents[tracked].append(branch_name)
3880
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print()
3882 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003884
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 def traverse_dependents_preorder(branch, padding=''):
3886 dependents_to_process = tracked_to_dependents.get(branch, [])
3887 padding += ' '
3888 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 dependents.append(dependent)
3891 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003892
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895
3896 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 return 0
3899
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 # Record all dependents that failed to upload.
3901 failures = {}
3902 # Go through all dependents, checkout the branch and upload.
3903 try:
3904 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print()
3906 print('--------------------------------------')
3907 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003909 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003910 try:
3911 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003913 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003914 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003915 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003917 finally:
3918 # Swap back to the original root branch.
3919 RunGit(['checkout', '-q', root_branch])
3920
vapiera7fbd5a2016-06-16 09:17:49 -07003921 print()
3922 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003923 for dependent_branch in dependents:
3924 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003925 print(' %s : %s' % (dependent_branch, upload_status))
3926 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003927
3928 return 0
3929
3930
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003931def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003932 """Given a proposed tag name, returns a tag name that is guaranteed to be
3933 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3934 or 'foo-3', and so on."""
3935
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003936 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003937 for suffix_num in itertools.count(1):
3938 if suffix_num == 1:
3939 to_check = proposed_tag
3940 else:
3941 to_check = '%s-%d' % (proposed_tag, suffix_num)
3942
3943 if to_check not in existing_tags:
3944 return to_check
3945
3946
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003947@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003948def CMDarchive(parser, args):
3949 """Archives and deletes branches associated with closed changelists."""
3950 parser.add_option(
3951 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003952 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003953 parser.add_option(
3954 '-f', '--force', action='store_true',
3955 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003956 parser.add_option(
3957 '-d', '--dry-run', action='store_true',
3958 help='Skip the branch tagging and removal steps.')
3959 parser.add_option(
3960 '-t', '--notags', action='store_true',
3961 help='Do not tag archived branches. '
3962 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003963 parser.add_option(
3964 '-p',
3965 '--pattern',
3966 default='git-cl-archived-{issue}-{branch}',
3967 help='Format string for archive tags. '
3968 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003969
kmarshall3bff56b2016-06-06 18:31:47 -07003970 options, args = parser.parse_args(args)
3971 if args:
3972 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003973
3974 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3975 if not branches:
3976 return 0
3977
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003978 tags = RunGit(['for-each-ref', '--format=%(refname)',
3979 'refs/tags']).splitlines() or []
3980 tags = [t.split('/')[-1] for t in tags]
3981
vapiera7fbd5a2016-06-16 09:17:49 -07003982 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003983 changes = [Changelist(branchref=b)
3984 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003985 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3986 statuses = get_cl_statuses(changes,
3987 fine_grained=True,
3988 max_processes=options.maxjobs)
3989 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003990 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3991 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003992 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003993 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003994 proposal.sort()
3995
3996 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003997 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003998 return 0
3999
Edward Lemur85153282020-02-14 22:06:29 +00004000 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07004001
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004003 if options.notags:
4004 for next_item in proposal:
4005 print(' ' + next_item[0])
4006 else:
4007 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4008 for next_item in proposal:
4009 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004010
kmarshall9249e012016-08-23 12:02:16 -07004011 # Quit now on precondition failure or if instructed by the user, either
4012 # via an interactive prompt or by command line flags.
4013 if options.dry_run:
4014 print('\nNo changes were made (dry run).\n')
4015 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004016
4017 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004018 print('You are currently on a branch \'%s\' which is associated with a '
4019 'closed codereview issue, so archive cannot proceed. Please '
4020 'checkout another branch and run this command again.' %
4021 current_branch)
4022 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004023
4024 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004025 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004026 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004028 return 1
4029
4030 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004031 if not options.notags:
4032 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004033
4034 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4035 # Clean up the tag if we failed to delete the branch.
4036 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004037
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004039
4040 return 0
4041
4042
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004043@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004044def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004045 """Show status of changelists.
4046
4047 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004048 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004049 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004050 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004051 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004052 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004053 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004054 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004055
4056 Also see 'git cl comments'.
4057 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004058 parser.add_option(
4059 '--no-branch-color',
4060 action='store_true',
4061 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004063 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004064 parser.add_option('-f', '--fast', action='store_true',
4065 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004066 parser.add_option(
4067 '-j', '--maxjobs', action='store', type=int,
4068 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004069 parser.add_option(
4070 '-i', '--issue', type=int,
4071 help='Operate on this issue instead of the current branch\'s implicit '
4072 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004073 parser.add_option('-d',
4074 '--date-order',
4075 action='store_true',
4076 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004077 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004078 if args:
4079 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080
iannuccie53c9352016-08-17 14:40:40 -07004081 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004082 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004083
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004085 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004087 if cl.GetIssue():
4088 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004089 elif options.field == 'id':
4090 issueid = cl.GetIssue()
4091 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004092 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004093 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004094 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004095 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004097 elif options.field == 'status':
4098 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004099 elif options.field == 'url':
4100 url = cl.GetIssueURL()
4101 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004103 return 0
4104
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004105 branches = RunGit([
4106 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4107 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004108 if not branches:
4109 print('No local branch found.')
4110 return 0
4111
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004112 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004113 Changelist(branchref=b, commit_date=ct)
4114 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4115 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004116 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004117 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004118 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004119 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004120
Edward Lemur85153282020-02-14 22:06:29 +00004121 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004122
4123 def FormatBranchName(branch, colorize=False):
4124 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4125 an asterisk when it is the current branch."""
4126
4127 asterisk = ""
4128 color = Fore.RESET
4129 if branch == current_branch:
4130 asterisk = "* "
4131 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004132 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004133
4134 if colorize:
4135 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004136 return asterisk + branch_name
4137
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004138 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004139
4140 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004141
4142 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004143 sorted_changes = sorted(changes,
4144 key=lambda c: c.GetCommitDate(),
4145 reverse=True)
4146 else:
4147 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4148 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004149 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004150 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004151 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004152 branch_statuses[c.GetBranch()] = status
4153 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004154 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004155 if url and (not status or status == 'error'):
4156 # The issue probably doesn't exist anymore.
4157 url += ' (broken)'
4158
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004159 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004160 # Turn off bold as well as colors.
4161 END = '\033[0m'
4162 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004163 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004164 color = ''
4165 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004166 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004167
Alan Cuttera3be9a52019-03-04 18:50:33 +00004168 branch_display = FormatBranchName(branch)
4169 padding = ' ' * (alignment - len(branch_display))
4170 if not options.no_branch_color:
4171 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004172
Alan Cuttera3be9a52019-03-04 18:50:33 +00004173 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4174 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004175
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004177 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004178 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004179 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004180 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004181 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004183 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004185 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004186 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004187 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188 return 0
4189
4190
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004191def colorize_CMDstatus_doc():
4192 """To be called once in main() to add colors to git cl status help."""
4193 colors = [i for i in dir(Fore) if i[0].isupper()]
4194
4195 def colorize_line(line):
4196 for color in colors:
4197 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004198 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004199 indent = len(line) - len(line.lstrip(' ')) + 1
4200 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4201 return line
4202
4203 lines = CMDstatus.__doc__.splitlines()
4204 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4205
4206
phajdan.jre328cf92016-08-22 04:12:17 -07004207def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004208 if path == '-':
4209 json.dump(contents, sys.stdout)
4210 else:
4211 with open(path, 'w') as f:
4212 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004213
4214
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004215@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004216@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004217def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004218 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219
4220 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004221 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004222 parser.add_option('-r', '--reverse', action='store_true',
4223 help='Lookup the branch(es) for the specified issues. If '
4224 'no issues are specified, all branches with mapped '
4225 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004226 parser.add_option('--json',
4227 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004228 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004229
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004231 branches = RunGit(['for-each-ref', 'refs/heads',
4232 '--format=%(refname)']).splitlines()
4233 # Reverse issue lookup.
4234 issue_branch_map = {}
4235
4236 git_config = {}
4237 for config in RunGit(['config', '--get-regexp',
4238 r'branch\..*issue']).splitlines():
4239 name, _space, val = config.partition(' ')
4240 git_config[name] = val
4241
4242 for branch in branches:
4243 issue = git_config.get(
4244 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4245 if issue:
4246 issue_branch_map.setdefault(int(issue), []).append(branch)
4247 if not args:
4248 args = sorted(issue_branch_map.keys())
4249 result = {}
4250 for issue in args:
4251 try:
4252 issue_num = int(issue)
4253 except ValueError:
4254 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4255 continue
4256 result[issue_num] = issue_branch_map.get(issue_num)
4257 print('Branch for issue number %s: %s' %
4258 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4259 if options.json:
4260 write_json(options.json, result)
4261 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004262
4263 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004264 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004265 if not issue.valid:
4266 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4267 'or no argument to list it.\n'
4268 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004269 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004270 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004271 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004272 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004273 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4274 if options.json:
4275 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004276 'gerrit_host': cl.GetGerritHost(),
4277 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004278 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004279 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004280 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004281 return 0
4282
4283
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004284@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004285def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004286 """Shows or posts review comments for any changelist."""
4287 parser.add_option('-a', '--add-comment', dest='comment',
4288 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004289 parser.add_option('-p', '--publish', action='store_true',
4290 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004291 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004292 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004293 parser.add_option('-m', '--machine-readable', dest='readable',
4294 action='store_false', default=True,
4295 help='output comments in a format compatible with '
4296 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004297 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004298 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004299 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004300
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004301 issue = None
4302 if options.issue:
4303 try:
4304 issue = int(options.issue)
4305 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004306 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307
Edward Lemur934836a2019-09-09 20:16:54 +00004308 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004309
4310 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004311 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004312 return 0
4313
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004314 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4315 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004316 for comment in summary:
4317 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004318 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004319 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004320 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004321 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004322 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004323 elif comment.autogenerated:
4324 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004325 else:
4326 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004327 print('\n%s%s %s%s\n%s' % (
4328 color,
4329 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4330 comment.sender,
4331 Fore.RESET,
4332 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4333
smut@google.comc85ac942015-09-15 16:34:43 +00004334 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004335 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004336 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004337 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4338 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004339 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004340 return 0
4341
4342
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004343@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004344@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004345def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004346 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004347 parser.add_option('-d', '--display', action='store_true',
4348 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004349 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004350 help='New description to set for this issue (- for stdin, '
4351 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004352 parser.add_option('-f', '--force', action='store_true',
4353 help='Delete any unpublished Gerrit edits for this issue '
4354 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004355
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004356 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004357
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004358 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004359 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004360 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004361 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004362 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004363
Edward Lemur934836a2019-09-09 20:16:54 +00004364 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004365 if target_issue_arg:
4366 kwargs['issue'] = target_issue_arg.issue
4367 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004368
4369 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004370 if not cl.GetIssue():
4371 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004372
Edward Lemur678a6842019-10-03 22:25:05 +00004373 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004374 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004375
Edward Lemur6c6827c2020-02-06 21:15:18 +00004376 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004377
smut@google.com34fb6b12015-07-13 20:03:26 +00004378 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004379 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004380 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004381
4382 if options.new_description:
4383 text = options.new_description
4384 if text == '-':
4385 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004386 elif text == '+':
4387 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004388 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004389
4390 description.set_description(text)
4391 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004392 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004393 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004394 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004395 return 0
4396
4397
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004398@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399def CMDlint(parser, args):
4400 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004401 parser.add_option('--filter', action='append', metavar='-x,+y',
4402 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004403 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004404
4405 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004406 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 try:
4408 import cpplint
4409 import cpplint_chromium
4410 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004411 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004412 return 1
4413
4414 # Change the current working directory before calling lint so that it
4415 # shows the correct base.
4416 previous_cwd = os.getcwd()
4417 os.chdir(settings.GetRoot())
4418 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004419 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004420 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004421 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004422 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004423 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004424
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004425 # Process cpplint arguments, if any.
4426 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
Daniel Chengabf48472023-08-30 15:45:13 +00004427 command = ['--filter=' + ','.join(filters)]
4428 command.extend(args)
4429 command.extend(files)
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004430 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004431
Lei Zhang379d1ad2020-07-15 19:40:06 +00004432 include_regex = re.compile(settings.GetLintRegex())
4433 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004434 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4435 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004436 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004437 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004438 continue
4439
4440 if ignore_regex.match(filename):
4441 print('Ignoring file %s' % filename)
4442 continue
4443
4444 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4445 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004446 finally:
4447 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004448 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004449 if cpplint._cpplint_state.error_count != 0:
4450 return 1
4451 return 0
4452
4453
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004454@metrics.collector.collect_metrics('git cl presubmit')
mlcuic601e362023-08-14 23:39:46 +00004455@subcommand.usage('[base branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004456def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004457 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004458 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004459 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004460 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004461 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004462 parser.add_option('--all', action='store_true',
4463 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004464 parser.add_option('--files',
4465 nargs=1,
4466 help='Semicolon-separated list of files to be marked as '
4467 'modified when executing presubmit or post-upload hooks. '
4468 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004469 parser.add_option('--parallel', action='store_true',
4470 help='Run all tests specified by input_api.RunTests in all '
4471 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004472 parser.add_option('--resultdb', action='store_true',
4473 help='Run presubmit checks in the ResultSink environment '
4474 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004475 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004476 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004477
sbc@chromium.org71437c02015-04-09 19:29:40 +00004478 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004479 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480 return 1
4481
Edward Lemur934836a2019-09-09 20:16:54 +00004482 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004483 if args:
4484 base_branch = args[0]
4485 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004486 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004487 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004489 start = time.time()
4490 try:
4491 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4492 description = cl.FetchDescription()
4493 else:
4494 description = _create_description_from_log([base_branch])
4495 except Exception as e:
4496 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004497 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004498 elapsed = time.time() - start
4499 if elapsed > 5:
4500 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004501
Bruce Dawson13acea32022-05-03 22:13:08 +00004502 if not base_branch:
4503 if not options.force:
4504 print('use --force to check even when not on a branch.')
4505 return 1
4506 base_branch = 'HEAD'
4507
Josip Sokcevic017544d2022-03-31 23:47:53 +00004508 cl.RunHook(committing=not options.upload,
4509 may_prompt=False,
4510 verbose=options.verbose,
4511 parallel=options.parallel,
4512 upstream=base_branch,
4513 description=description,
4514 all_files=options.all,
4515 files=options.files,
4516 resultdb=options.resultdb,
4517 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004518 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004519
4520
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004521def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004522 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004523
4524 Works the same way as
4525 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4526 but can be called on demand on all platforms.
4527
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004528 The basic idea is to generate git hash of a state of the tree, original
4529 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004530 """
4531 lines = []
4532 tree_hash = RunGitSilent(['write-tree'])
4533 lines.append('tree %s' % tree_hash.strip())
4534 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4535 if code == 0:
4536 lines.append('parent %s' % parent.strip())
4537 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4538 lines.append('author %s' % author.strip())
4539 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4540 lines.append('committer %s' % committer.strip())
4541 lines.append('')
4542 # Note: Gerrit's commit-hook actually cleans message of some lines and
4543 # whitespace. This code is not doing this, but it clearly won't decrease
4544 # entropy.
4545 lines.append(message)
4546 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004547 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004548 return 'I%s' % change_hash.strip()
4549
4550
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004551def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004552 """Computes the remote branch ref to use for the CL.
4553
4554 Args:
4555 remote (str): The git remote for the CL.
4556 remote_branch (str): The git remote branch for the CL.
4557 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004558 """
4559 if not (remote and remote_branch):
4560 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004561
wittman@chromium.org455dc922015-01-26 20:15:50 +00004562 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004563 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004564 # refs, which are then translated into the remote full symbolic refs
4565 # below.
4566 if '/' not in target_branch:
4567 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4568 else:
4569 prefix_replacements = (
4570 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4571 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4572 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4573 )
4574 match = None
4575 for regex, replacement in prefix_replacements:
4576 match = re.search(regex, target_branch)
4577 if match:
4578 remote_branch = target_branch.replace(match.group(0), replacement)
4579 break
4580 if not match:
4581 # This is a branch path but not one we recognize; use as-is.
4582 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004583 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004584 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004585 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004586 # Handle the refs that need to land in different refs.
4587 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004588
wittman@chromium.org455dc922015-01-26 20:15:50 +00004589 # Create the true path to the remote branch.
4590 # Does the following translation:
4591 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004592 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004593 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4594 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4595 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4596 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4597 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4598 'refs/heads/')
4599 elif remote_branch.startswith('refs/remotes/branch-heads'):
4600 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004601
wittman@chromium.org455dc922015-01-26 20:15:50 +00004602 return remote_branch
4603
4604
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004605def cleanup_list(l):
4606 """Fixes a list so that comma separated items are put as individual items.
4607
4608 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4609 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4610 """
4611 items = sum((i.split(',') for i in l), [])
4612 stripped_items = (i.strip() for i in items)
4613 return sorted(filter(None, stripped_items))
4614
4615
Aaron Gable4db38df2017-11-03 14:59:07 -07004616@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004617@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004618def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004619 """Uploads the current changelist to codereview.
4620
4621 Can skip dependency patchset uploads for a branch by running:
4622 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004623 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004624 git config --unset branch.branch_name.skip-deps-uploads
4625 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004626
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004627 If the name of the checked out branch starts with "bug-" or "fix-" followed
4628 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004629 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004630
4631 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004632 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004633 [git-cl] add support for hashtags
4634 Foo bar: implement foo
4635 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004636 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004637 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4638 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004639 parser.add_option('--bypass-watchlists', action='store_true',
4640 dest='bypass_watchlists',
4641 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004642 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004643 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004644 parser.add_option('--message', '-m', dest='message',
4645 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004646 parser.add_option('-b', '--bug',
4647 help='pre-populate the bug number(s) for this issue. '
4648 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004649 parser.add_option('--message-file', dest='message_file',
4650 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004651 parser.add_option('--title', '-t', dest='title',
4652 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004653 parser.add_option('-T', '--skip-title', action='store_true',
4654 dest='skip_title',
4655 help='Use the most recent commit message as the title of '
4656 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004657 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004658 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004659 help='reviewer email addresses')
4660 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004661 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004662 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004663 parser.add_option('--hashtag', dest='hashtags',
4664 action='append', default=[],
4665 help=('Gerrit hashtag for new CL; '
4666 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004667 parser.add_option('-s',
4668 '--send-mail',
4669 '--send-email',
4670 dest='send_mail',
4671 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004672 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004673 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004674 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004675 metavar='TARGET',
4676 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004677 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004678 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004679 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004680 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004681 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004682 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004683 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004684 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4685 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004686 parser.add_option('-c',
4687 '--use-commit-queue',
4688 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004689 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004690 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004691 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004692 parser.add_option('-d', '--cq-dry-run',
4693 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004694 help='Send the patchset to do a CQ dry run right after '
4695 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004696 parser.add_option('--set-bot-commit', action='store_true',
4697 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004698 parser.add_option('--preserve-tryjobs', action='store_true',
4699 help='instruct the CQ to let tryjobs running even after '
4700 'new patchsets are uploaded instead of canceling '
4701 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004702 parser.add_option('--dependencies', action='store_true',
4703 help='Uploads CLs of all the local branches that depend on '
4704 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004705 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4706 help='Sends your change to the CQ after an approval. Only '
4707 'works on repos that have the Auto-Submit label '
4708 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004709 parser.add_option('--parallel', action='store_true',
4710 help='Run all tests specified by input_api.RunTests in all '
4711 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004712 parser.add_option('--no-autocc', action='store_true',
4713 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004714 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004715 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004716 parser.add_option('-R', '--retry-failed', action='store_true',
4717 help='Retry failed tryjobs from old patchset immediately '
4718 'after uploading new patchset. Cannot be used with '
4719 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004720 parser.add_option('--fixed', '-x',
4721 help='List of bugs that will be commented on and marked '
4722 'fixed (pre-populates "Fixed:" tag). Same format as '
4723 '-b option / "Bug:" tag. If fixing several issues, '
4724 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004725 parser.add_option('--edit-description', action='store_true', default=False,
4726 help='Modify description before upload. Cannot be used '
4727 'with --force. It is a noop when --no-squash is set '
4728 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004729 parser.add_option('--git-completion-helper', action="store_true",
4730 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004731 parser.add_option('-o',
4732 '--push-options',
4733 action='append',
4734 default=[],
4735 help='Transmit the given string to the server when '
4736 'performing git push (pass-through). See git-push '
4737 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004738 parser.add_option('--no-add-changeid',
4739 action='store_true',
4740 dest='no_add_changeid',
4741 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004742 parser.add_option('--cherry-pick-stacked',
4743 '--cp',
4744 dest='cherry_pick_stacked',
4745 action='store_true',
4746 help='If parent branch has un-uploaded updates, '
4747 'automatically skip parent branches and just upload '
4748 'the current branch cherry-pick on its parent\'s last '
4749 'uploaded commit. Allows users to skip the potential '
4750 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004751 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004752
rmistry@google.com2dd99862015-06-22 12:22:18 +00004753 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004754 (options, args) = parser.parse_args(args)
4755
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004756 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004757 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4758 if opt.help != optparse.SUPPRESS_HELP))
4759 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004760
Aravind Vasudevanb8164182023-08-25 21:49:12 +00004761 # TODO(crbug.com/1475405): Warn users if the project uses submodules and
4762 # they have fsmonitor enabled.
4763 if os.path.isfile('.gitmodules'):
4764 git_common.warn_submodule()
4765
sbc@chromium.org71437c02015-04-09 19:29:40 +00004766 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004767 return 1
4768
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004769 options.reviewers = cleanup_list(options.reviewers)
4770 options.cc = cleanup_list(options.cc)
4771
Josipe827b0f2020-01-30 00:07:20 +00004772 if options.edit_description and options.force:
4773 parser.error('Only one of --force and --edit-description allowed')
4774
tandriib80458a2016-06-23 12:20:07 -07004775 if options.message_file:
4776 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004777 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004778 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004779
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004780 if ([options.cq_dry_run,
4781 options.use_commit_queue,
4782 options.retry_failed].count(True) > 1):
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00004783 parser.error('Only one of --use-commit-queue, --cq-dry-run or '
4784 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004785
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004786 if options.skip_title and options.title:
4787 parser.error('Only one of --title and --skip-title allowed.')
4788
Aaron Gableedbc4132017-09-11 13:22:28 -07004789 if options.use_commit_queue:
4790 options.send_mail = True
4791
Edward Lesmes0dd54822020-03-26 18:24:25 +00004792 if options.squash is None:
4793 # Load default for user, repo, squash=true, in this order.
4794 options.squash = settings.GetSquashGerritUploads()
4795
Joanna Wang5051ffe2023-03-01 22:24:07 +00004796 cl = Changelist(branchref=options.target_branch)
4797
4798 # Warm change details cache now to avoid RPCs later, reducing latency for
4799 # developers.
4800 if cl.GetIssue():
4801 cl._GetChangeDetail(
4802 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4803
4804 if options.retry_failed and not cl.GetIssue():
4805 print('No previous patchsets, so --retry-failed has no effect.')
4806 options.retry_failed = False
4807
Joanna Wang5051ffe2023-03-01 22:24:07 +00004808
Joanna Wang4786a412023-05-16 18:23:08 +00004809 disable_dogfood_stacked_changes = os.environ.get(
4810 DOGFOOD_STACKED_CHANGES_VAR) == '0'
4811 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'
4812
4813 # Only print message for folks who don't have DOGFOOD_STACKED_CHANGES set
4814 # to an expected value.
4815 if (options.squash and not dogfood_stacked_changes
4816 and not disable_dogfood_stacked_changes):
Joanna Wang1398e4f2023-05-01 18:49:13 +00004817 print(
4818 'This repo has been enrolled in the stacked changes dogfood.\n'
4819 '`git cl upload` now uploads the current branch and all upstream '
4820 'branches that have un-uploaded updates.\n'
4821 'Patches can now be reapplied with --force:\n'
4822 '`git cl patch --reapply --force`.\n'
4823 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
Joanna Wang4786a412023-05-16 18:23:08 +00004824 '\n'
4825 'Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4826 '"Set new changes to "work in progress" by default" checkbox at\n'
4827 'https://<host>-review.googlesource.com/settings/\n'
4828 '\n'
4829 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.\n'
4830 'To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004831 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004832
Joanna Wang4786a412023-05-16 18:23:08 +00004833 if options.squash and not disable_dogfood_stacked_changes:
Joanna Wangdd12deb2023-01-26 20:43:28 +00004834 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004835 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004836
Joanna Wangd75fc882023-03-01 21:53:34 +00004837 if options.cherry_pick_stacked:
4838 try:
4839 orig_args.remove('--cherry-pick-stacked')
4840 except ValueError:
4841 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004842 UploadAllSquashed(options, orig_args)
4843 return 0
4844
Joanna Wangd75fc882023-03-01 21:53:34 +00004845 if options.cherry_pick_stacked:
4846 parser.error('--cherry-pick-stacked is not available for this workflow.')
4847
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004848 # cl.GetMostRecentPatchset uses cached information, and can return the last
4849 # patchset before upload. Calling it here makes it clear that it's the
4850 # last patchset before upload. Note that GetMostRecentPatchset will fail
4851 # if no CL has been uploaded yet.
4852 if options.retry_failed:
4853 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004854
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004855 ret = cl.CMDUpload(options, args, orig_args)
4856
4857 if options.retry_failed:
4858 if ret != 0:
4859 print('Upload failed, so --retry-failed has no effect.')
4860 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004861 builds, _ = _fetch_latest_builds(cl,
4862 DEFAULT_BUILDBUCKET_HOST,
4863 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004864 jobs = _filter_failed_for_retry(builds)
4865 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004866 print('No failed tryjobs, so --retry-failed has no effect.')
4867 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004868 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004869
4870 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004871
4872
Daniel Cheng66d0f152023-08-29 23:21:58 +00004873def UploadAllSquashed(options: optparse.Values,
4874 orig_args: Sequence[str]) -> int:
Joanna Wang18de1f62023-01-21 01:24:24 +00004875 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004876 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004877
Joanna Wangc710e2d2023-01-25 14:53:22 +00004878 # Create commits.
Daniel Chengabf48472023-08-30 15:45:13 +00004879 uploads_by_cl: List[Tuple[Changelist, _NewUpload]] = []
Joanna Wangc710e2d2023-01-25 14:53:22 +00004880 if cherry_pick_current:
4881 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4882 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4883 uploads_by_cl.append((cls[0], new_upload))
4884 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004885 ordered_cls = list(reversed(cls))
4886
Joanna Wang6215dd02023-02-07 15:58:03 +00004887 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004888 # We can only support external changes when we're only uploading one
4889 # branch.
4890 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004891 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004892 if parent is None:
4893 origin = '.'
4894 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004895
Joanna Wang7603f042023-03-01 22:17:36 +00004896 while origin == '.':
4897 # Search for cl's closest ancestor with a gerrit hash.
4898 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4899 if origin == '.':
4900 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4901
4902 # Support the `git merge` and `git pull` workflow.
4903 if upstream_branch in ['master', 'main']:
4904 parent = cl.GetCommonAncestorWithUpstream()
4905 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004906 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4907 upstream_branch,
4908 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004909 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4910 upstream_branch,
4911 GERRIT_SQUASH_HASH_CONFIG_KEY)
4912 if parent:
4913 break
4914 branch = upstream_branch
4915 else:
4916 # Either the root of the tree is the cl's direct parent and the while
4917 # loop above only found empty branches between cl and the root of the
4918 # tree.
4919 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004920
Joanna Wang05b60342023-03-29 20:25:57 +00004921 if orig_parent is None:
4922 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004923 for i, cl in enumerate(ordered_cls):
4924 # If we're in the middle of the stack, set end_commit to downstream's
4925 # direct ancestor.
4926 if i + 1 < len(ordered_cls):
4927 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4928 else:
4929 child_base_commit = None
4930 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004931 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004932 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004933 end_commit=child_base_commit)
4934 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004935 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004936 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004937
4938 # Create refspec options
4939 cl, new_upload = uploads_by_cl[-1]
4940 refspec_opts = cl._GetRefSpecOptions(
4941 options,
4942 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004943 multi_change_upload=len(uploads_by_cl) > 1,
4944 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004945 refspec_suffix = ''
4946 if refspec_opts:
4947 refspec_suffix = '%' + ','.join(refspec_opts)
4948 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4949 refspec_suffix)
4950
4951 remote, remote_branch = cl.GetRemoteBranch()
4952 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4953 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4954 refspec_suffix)
4955
4956 # Git push
4957 git_push_metadata = {
4958 'gerrit_host':
4959 cl.GetGerritHost(),
4960 'title':
4961 options.title or '<untitled>',
4962 'change_id':
4963 git_footers.get_footer_change_id(new_upload.change_desc.description),
4964 'description':
4965 new_upload.change_desc.description,
4966 }
4967 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004968 git_push_metadata,
4969 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004970
4971 # Post push updates
4972 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4973 change_numbers = [
4974 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4975 ]
4976
4977 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4978 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4979
4980 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004981
4982
4983def _UploadAllPrecheck(options, orig_args):
4984 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4985 """Checks the state of the tree and gives the user uploading options
4986
4987 Returns: A tuple of the ordered list of changes that have new commits
4988 since their last upload and a boolean of whether the user wants to
4989 cherry-pick and upload the current branch instead of uploading all cls.
4990 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004991 cl = Changelist()
4992 if cl.GetBranch() is None:
4993 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4994
Joanna Wang18de1f62023-01-21 01:24:24 +00004995 branch_ref = None
4996 cls = []
4997 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004998 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004999
5000 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
5001
5002 while True:
5003 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
5004 DieWithError(
5005 'More than %s branches in the stack have not been uploaded.\n'
5006 'Are your branches in a misconfigured state?\n'
5007 'If not, please upload some upstream changes first.' %
5008 (_MAX_STACKED_BRANCHES_UPLOAD))
5009
5010 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005011
Joanna Wang6215dd02023-02-07 15:58:03 +00005012 # Only add CL if it has anything to commit.
5013 base_commit = cl.GetCommonAncestorWithUpstream()
5014 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5015
Daniel Cheng66d0f152023-08-29 23:21:58 +00005016 commit_summary = _GetCommitCountSummary(base_commit, end_commit)
5017 if commit_summary:
Joanna Wang6215dd02023-02-07 15:58:03 +00005018 cls.append(cl)
5019 if (not first_pass and
5020 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5021 # We are mid-stack and the user must upload their upstream branches.
5022 must_upload_upstream = True
Daniel Cheng66d0f152023-08-29 23:21:58 +00005023 print(f'Found change with {commit_summary}...')
Joanna Wang6215dd02023-02-07 15:58:03 +00005024 elif first_pass: # The current branch has nothing to commit. Exit.
5025 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5026 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5027 first_pass = False
5028
5029 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 branch_ref = upstream_branch_ref # set branch for next run.
5032
Joanna Wang6215dd02023-02-07 15:58:03 +00005033 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5034 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5035 upstream_branch,
5036 LAST_UPLOAD_HASH_CONFIG_KEY)
5037
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 # Case 1: We've reached the beginning of the tree.
5039 if origin != '.':
5040 break
5041
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005043 # the user MUST upload them unless they are empty. Continue to
5044 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005045 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005046 continue
5047
Joanna Wang18de1f62023-01-21 01:24:24 +00005048 # Case 3: If upstream's last_upload == cl.base_commit we do
5049 # not need to upload any more upstreams from this point on.
5050 # (Even if there may be diverged branches higher up the tree)
5051 if base_commit == upstream_last_upload:
5052 break
5053
5054 # Case 4: If upstream's last_upload < cl.base_commit we are
5055 # uploading cl and upstream_cl.
5056 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005057 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005058 continue
5059
5060 # Case 5: If cl.base_commit < upstream's last_upload the user
5061 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005062 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005063 DieWithError(
5064 'At least one branch in the stack has diverged from its upstream '
5065 'branch and does not contain its upstream\'s last upload.\n'
5066 'Please rebase the stack with `git rebase-update` before uploading.')
5067
5068 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5069 # any relation to commits in the tree. Continue up the tree until we hit
5070 # the root.
5071
5072 # We assume all cls in the stack have the same auth requirements and only
5073 # check this once.
5074 cls[0].EnsureAuthenticated(force=options.force)
5075
5076 cherry_pick = False
5077 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005078 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005079 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005080 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005081 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005082 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005083 msg = ('At least one parent branch in `%s` has never been uploaded '
5084 'and must be uploaded before/with `%s`.\n' %
5085 (branches, cls[1].branch))
5086 if options.cherry_pick_stacked:
5087 DieWithError(msg)
5088 if not options.force:
5089 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005090 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005091 if options.cherry_pick_stacked:
5092 print('cherry-picking `%s` on %s\'s last upload' %
5093 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005094 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005095 elif not options.force:
5096 answer = gclient_utils.AskForData(
5097 '\n' + opt_message +
5098 'Press enter to update branches %s.\nOr type `n` to upload only '
5099 '`%s` cherry-picked on %s\'s last upload:' %
5100 (branches, cls[0].branch, cls[1].branch))
5101 if answer.lower() == 'n':
5102 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005103 return cls, cherry_pick
5104
5105
Francois Dorayd42c6812017-05-30 15:10:20 -04005106@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005107@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005108def CMDsplit(parser, args):
5109 """Splits a branch into smaller branches and uploads CLs.
5110
5111 Creates a branch and uploads a CL for each group of files modified in the
5112 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005113 comment, the string '$directory', is replaced with the directory containing
5114 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005115 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005116 parser.add_option('-d', '--description', dest='description_file',
5117 help='A text file containing a CL description in which '
5118 '$directory will be replaced by each CL\'s directory.')
5119 parser.add_option('-c', '--comment', dest='comment_file',
5120 help='A text file containing a CL comment.')
5121 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005122 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005123 help='List the files and reviewers for each CL that would '
5124 'be created, but don\'t create branches or CLs.')
5125 parser.add_option('--cq-dry-run', action='store_true',
5126 help='If set, will do a cq dry run for each uploaded CL. '
5127 'Please be careful when doing this; more than ~10 CLs '
5128 'has the potential to overload our build '
5129 'infrastructure. Try to upload these not during high '
5130 'load times (usually 11-3 Mountain View time). Email '
5131 'infra-dev@chromium.org with any questions.')
Anne Redulla072d06e2023-07-06 23:12:16 +00005132 parser.add_option('-a',
5133 '--enable-auto-submit',
5134 action='store_true',
5135 dest='enable_auto_submit',
Takuto Ikuta51eca592019-02-14 19:40:52 +00005136 default=True,
5137 help='Sends your change to the CQ after an approval. Only '
Anne Redulla072d06e2023-07-06 23:12:16 +00005138 'works on repos that have the Auto-Submit label '
5139 'enabled')
5140 parser.add_option('--disable-auto-submit',
5141 action='store_false',
5142 dest='enable_auto_submit',
5143 help='Disables automatic sending of the changes to the CQ '
5144 'after approval. Note that auto-submit only works for '
5145 'repos that have the Auto-Submit label enabled.')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005146 parser.add_option('--max-depth',
5147 type='int',
5148 default=0,
5149 help='The max depth to look for OWNERS files. Useful for '
5150 'controlling the granularity of the split CLs, e.g. '
5151 '--max-depth=1 will only split by top-level '
5152 'directory. Specifying a value less than 1 means no '
5153 'limit on max depth.')
Rachael Newitt03e49122023-06-28 21:39:21 +00005154 parser.add_option('--topic',
5155 default=None,
5156 help='Topic to specify when uploading')
Francois Dorayd42c6812017-05-30 15:10:20 -04005157 options, _ = parser.parse_args(args)
5158
5159 if not options.description_file:
5160 parser.error('No --description flag specified.')
5161
5162 def WrappedCMDupload(args):
5163 return CMDupload(OptionParser(), args)
5164
Daniel Cheng403c44e2022-10-05 22:24:58 +00005165 return split_cl.SplitCl(options.description_file, options.comment_file,
5166 Changelist, WrappedCMDupload, options.dry_run,
5167 options.cq_dry_run, options.enable_auto_submit,
Rachael Newitt03e49122023-06-28 21:39:21 +00005168 options.max_depth, options.topic, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005169
5170
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005171@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005172@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005173def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005174 """DEPRECATED: Used to commit the current changelist via git-svn."""
5175 message = ('git-cl no longer supports committing to SVN repositories via '
5176 'git-svn. You probably want to use `git cl land` instead.')
5177 print(message)
5178 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005179
5180
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005181@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005182@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005183def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005184 """Commits the current changelist via git.
5185
5186 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5187 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005188 """
5189 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5190 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005191 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005192 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005193 parser.add_option('--parallel', action='store_true',
5194 help='Run all tests specified by input_api.RunTests in all '
5195 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005196 parser.add_option('--resultdb', action='store_true',
5197 help='Run presubmit checks in the ResultSink environment '
5198 'and send results to the ResultDB database.')
5199 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005200 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005201
Edward Lemur934836a2019-09-09 20:16:54 +00005202 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005203
Robert Iannucci2e73d432018-03-14 01:10:47 -07005204 if not cl.GetIssue():
5205 DieWithError('You must upload the change first to Gerrit.\n'
5206 ' If you would rather have `git cl land` upload '
5207 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005208 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5209 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005210
5211
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005212@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005213@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005214def CMDpatch(parser, args):
Victor Hugo Vianna Silvadeff9a22023-07-11 18:07:18 +00005215 """Applies (cherry-picks) a Gerrit changelist locally."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005216 parser.add_option('-b', dest='newbranch',
5217 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005218 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005219 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005220 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005221 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005222
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005223 group = optparse.OptionGroup(
5224 parser,
5225 'Options for continuing work on the current issue uploaded from a '
5226 'different clone (e.g. different machine). Must be used independently '
5227 'from the other options. No issue number should be specified, and the '
5228 'branch must have an issue number associated with it')
5229 group.add_option('--reapply', action='store_true', dest='reapply',
5230 help='Reset the branch and reapply the issue.\n'
5231 'CAUTION: This will undo any local changes in this '
5232 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005233
5234 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005235 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005236 parser.add_option_group(group)
5237
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005238 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005239
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005240 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005241 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005242 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005243 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005244 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005245
Edward Lemur934836a2019-09-09 20:16:54 +00005246 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005247 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005248 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005249
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005250 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005251 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005252 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005253
5254 RunGit(['reset', '--hard', upstream])
5255 if options.pull:
5256 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005257
Edward Lemur678a6842019-10-03 22:25:05 +00005258 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005259 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5260 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005261
5262 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005263 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005264
Edward Lemurf38bc172019-09-03 21:02:13 +00005265 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005266 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005267 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005268
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005269 # We don't want uncommitted changes mixed up with the patch.
5270 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005271 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005273 if options.newbranch:
5274 if options.force:
5275 RunGit(['branch', '-D', options.newbranch],
5276 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005277 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005278
Edward Lemur678a6842019-10-03 22:25:05 +00005279 cl = Changelist(
5280 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005281
Edward Lemur678a6842019-10-03 22:25:05 +00005282 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005283 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005284
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005285 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5286 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287
5288
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005289def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290 """Fetches the tree status and returns either 'open', 'closed',
5291 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005292 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005294 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005295 if status.find('closed') != -1 or status == '0':
5296 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005297
5298 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005300
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005301 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302 return 'unset'
5303
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005304
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005305def GetTreeStatusReason():
5306 """Fetches the tree status from a json url and returns the message
5307 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005308 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005309 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005310 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005311 status = json.loads(connection.read())
5312 connection.close()
5313 return status['message']
5314
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005315
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005316@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005317def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005318 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005319 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005320 status = GetTreeStatus()
5321 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005322 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005323 return 2
5324
vapiera7fbd5a2016-06-16 09:17:49 -07005325 print('The tree is %s' % status)
5326 print()
5327 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005328 if status != 'open':
5329 return 1
5330 return 0
5331
5332
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005333@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005334def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005335 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5336 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005338 '-b', '--bot', action='append',
5339 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5340 'times to specify multiple builders. ex: '
5341 '"-b win_rel -b win_layout". See '
5342 'the try server waterfall for the builders name and the tests '
5343 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005344 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005345 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005346 help=('Buildbucket bucket to send the try requests. Format: '
5347 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005348 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005349 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005350 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005351 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005352 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005353 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005354 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005355 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005356 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005357 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005358 '--category', default='git_cl_try', help='Specify custom build category.')
5359 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005360 '--project',
5361 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005362 'in recipe to determine to which repository or directory to '
5363 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005364 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005365 '-p', '--property', dest='properties', action='append', default=[],
5366 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005367 'key2=value2 etc. The value will be treated as '
5368 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005369 'NOTE: using this may make your tryjob not usable for CQ, '
5370 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005371 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005372 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5373 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005374 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005375 parser.add_option(
5376 '-R', '--retry-failed', action='store_true', default=False,
5377 help='Retry failed jobs from the latest set of tryjobs. '
5378 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005379 parser.add_option(
5380 '-i', '--issue', type=int,
5381 help='Operate on this issue instead of the current branch\'s implicit '
5382 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005383 options, args = parser.parse_args(args)
5384
machenbach@chromium.org45453142015-09-15 08:45:22 +00005385 # Make sure that all properties are prop=value pairs.
5386 bad_params = [x for x in options.properties if '=' not in x]
5387 if bad_params:
5388 parser.error('Got properties with missing "=": %s' % bad_params)
5389
maruel@chromium.org15192402012-09-06 12:38:29 +00005390 if args:
5391 parser.error('Unknown arguments: %s' % args)
5392
Edward Lemur934836a2019-09-09 20:16:54 +00005393 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005394 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005395 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005396
Edward Lemurf38bc172019-09-03 21:02:13 +00005397 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005398 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005399
tandriie113dfd2016-10-11 10:20:12 -07005400 error_message = cl.CannotTriggerTryJobReason()
5401 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005402 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005403
Edward Lemur45768512020-03-02 19:03:14 +00005404 if options.bot:
5405 if options.retry_failed:
5406 parser.error('--bot is not compatible with --retry-failed.')
5407 if not options.bucket:
5408 parser.error('A bucket (e.g. "chromium/try") is required.')
5409
5410 triggered = [b for b in options.bot if 'triggered' in b]
5411 if triggered:
5412 parser.error(
5413 'Cannot schedule builds on triggered bots: %s.\n'
5414 'This type of bot requires an initial job from a parent (usually a '
5415 'builder). Schedule a job on the parent instead.\n' % triggered)
5416
5417 if options.bucket.startswith('.master'):
5418 parser.error('Buildbot masters are not supported.')
5419
5420 project, bucket = _parse_bucket(options.bucket)
5421 if project is None or bucket is None:
5422 parser.error('Invalid bucket: %s.' % options.bucket)
5423 jobs = sorted((project, bucket, bot) for bot in options.bot)
5424 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005425 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005426 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005427 if options.verbose:
5428 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005429 jobs = _filter_failed_for_retry(builds)
5430 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005431 print('There are no failed jobs in the latest set of jobs '
5432 '(patchset #%d), doing nothing.' % patchset)
5433 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005434 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005435 if num_builders > 10:
5436 confirm_or_exit('There are %d builders with failed builds.'
5437 % num_builders, action='continue')
5438 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005439 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005440 print('git cl try with no bots now defaults to CQ dry run.')
5441 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5442 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005443
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005444 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005445 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005446 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005447 except BuildbucketResponseException as ex:
5448 print('ERROR: %s' % ex)
5449 return 1
5450 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005451
5452
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005453@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005454def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005455 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005456 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005458 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005459 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005460 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005461 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005462 '--color', action='store_true', default=setup_color.IS_TTY,
5463 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005464 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005465 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5466 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005467 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005468 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005469 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005470 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005471 parser.add_option(
5472 '-i', '--issue', type=int,
5473 help='Operate on this issue instead of the current branch\'s implicit '
5474 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475 options, args = parser.parse_args(args)
5476 if args:
5477 parser.error('Unrecognized args: %s' % ' '.join(args))
5478
Edward Lemur934836a2019-09-09 20:16:54 +00005479 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005480 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005481 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005482
tandrii221ab252016-10-06 08:12:04 -07005483 patchset = options.patchset
5484 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005485 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005486 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005487 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005488 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005489 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005490 cl.GetIssue())
5491
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005492 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005493 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005494 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005495 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005496 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005497 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005498 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005499 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005500 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005501 return 0
5502
5503
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005504@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005505@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005506def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005507 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005508 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005509 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005510 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005511
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005512 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005513 if args:
5514 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005515 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005516 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005517 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005518 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005519
5520 # Clear configured merge-base, if there is one.
5521 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005522 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005523 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005524 return 0
5525
5526
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005527@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005528def CMDweb(parser, args):
5529 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005530 parser.add_option('-p',
5531 '--print-only',
5532 action='store_true',
5533 dest='print_only',
5534 help='Only print the Gerrit URL, don\'t open it in the '
5535 'browser.')
5536 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005537 if args:
5538 parser.error('Unrecognized args: %s' % ' '.join(args))
5539
5540 issue_url = Changelist().GetIssueURL()
5541 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005542 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005543 return 1
5544
Orr Bernstein0b960582022-12-22 20:16:18 +00005545 if options.print_only:
5546 print(issue_url)
5547 return 0
5548
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005549 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005550 # allows us to hide the "Created new window in existing browser session."
5551 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005552 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005553 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005554 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005555 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005556 os.open(os.devnull, os.O_RDWR)
5557 try:
5558 webbrowser.open(issue_url)
5559 finally:
5560 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005561 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005562 return 0
5563
5564
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005565@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005566def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005567 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005568 parser.add_option('-d', '--dry-run', action='store_true',
5569 help='trigger in dry run mode')
5570 parser.add_option('-c', '--clear', action='store_true',
5571 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005572 parser.add_option(
5573 '-i', '--issue', type=int,
5574 help='Operate on this issue instead of the current branch\'s implicit '
5575 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005576 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005577 if args:
5578 parser.error('Unrecognized args: %s' % ' '.join(args))
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00005579 if [options.dry_run, options.clear].count(True) > 1:
5580 parser.error('Only one of --dry-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005581
Edward Lemur934836a2019-09-09 20:16:54 +00005582 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005583 if not cl.GetIssue():
5584 parser.error('Must upload the issue first.')
5585
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005586 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005587 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005588 elif options.dry_run:
5589 state = _CQState.DRY_RUN
5590 else:
5591 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005592 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005593 return 0
5594
5595
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005596@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005597def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005598 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005599 parser.add_option(
5600 '-i', '--issue', type=int,
5601 help='Operate on this issue instead of the current branch\'s implicit '
5602 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005603 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005604 if args:
5605 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005606 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005607 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005608 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005609 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005610 cl.CloseIssue()
5611 return 0
5612
5613
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005614@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005615def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005616 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005617 parser.add_option(
5618 '--stat',
5619 action='store_true',
5620 dest='stat',
5621 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005622 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005623 if args:
5624 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005625
Edward Lemur934836a2019-09-09 20:16:54 +00005626 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005627 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005628 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005629 if not issue:
5630 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005631
Gavin Makbe2e9262022-11-08 23:41:55 +00005632 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005633 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005634 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005635 if not base:
5636 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5637 revision_info = detail['revisions'][detail['current_revision']]
5638 fetch_info = revision_info['fetch']['http']
5639 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5640 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005641
Aaron Gablea718c3e2017-08-28 17:47:28 -07005642 cmd = ['git', 'diff']
5643 if options.stat:
5644 cmd.append('--stat')
5645 cmd.append(base)
5646 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005647
5648 return 0
5649
5650
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005651@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005652def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005653 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005654 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005655 '--ignore-current',
5656 action='store_true',
5657 help='Ignore the CL\'s current reviewers and start from scratch.')
5658 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005659 '--ignore-self',
5660 action='store_true',
5661 help='Do not consider CL\'s author as an owners.')
5662 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005663 '--no-color',
5664 action='store_true',
5665 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005666 parser.add_option(
5667 '--batch',
5668 action='store_true',
5669 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005670 # TODO: Consider moving this to another command, since other
5671 # git-cl owners commands deal with owners for a given CL.
5672 parser.add_option(
5673 '--show-all',
5674 action='store_true',
5675 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005676 options, args = parser.parse_args(args)
5677
Edward Lemur934836a2019-09-09 20:16:54 +00005678 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005679 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005680
Yang Guo6e269a02019-06-26 11:17:02 +00005681 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005682 if len(args) == 0:
5683 print('No files specified for --show-all. Nothing to do.')
5684 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005685 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005686 for path in args:
5687 print('Owners for %s:' % path)
5688 print('\n'.join(
5689 ' - %s' % owner
5690 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005691 return 0
5692
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005693 if args:
5694 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005695 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005696 base_branch = args[0]
5697 else:
5698 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005699 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005700
Edward Lemur2c62b332020-03-12 22:12:33 +00005701 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005702
5703 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005704 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5705 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005706 return 0
5707
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005708 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005709 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005710 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005711 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005712 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005713 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005714 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005715
5716
Aiden Bennerc08566e2018-10-03 17:52:42 +00005717def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005718 """Generates a diff command."""
5719 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005720 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5721
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005722 if allow_prefix:
5723 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5724 # case that diff.noprefix is set in the user's git config.
5725 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5726 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005727 diff_cmd += ['--no-prefix']
5728
5729 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005730
5731 if args:
5732 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005733 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005734 diff_cmd.append(arg)
5735 else:
5736 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005737
5738 return diff_cmd
5739
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005740
Jamie Madill5e96ad12020-01-13 16:08:35 +00005741def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5742 """Runs clang-format-diff and sets a return value if necessary."""
5743
5744 if not clang_diff_files:
5745 return 0
5746
5747 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5748 # formatted. This is used to block during the presubmit.
5749 return_value = 0
5750
5751 # Locate the clang-format binary in the checkout
5752 try:
5753 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5754 except clang_format.NotFoundError as e:
5755 DieWithError(e)
5756
5757 if opts.full or settings.GetFormatFullByDefault():
5758 cmd = [clang_format_tool]
5759 if not opts.dry_run and not opts.diff:
5760 cmd.append('-i')
5761 if opts.dry_run:
5762 for diff_file in clang_diff_files:
5763 with open(diff_file, 'r') as myfile:
5764 code = myfile.read().replace('\r\n', '\n')
5765 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5766 stdout = stdout.replace('\r\n', '\n')
5767 if opts.diff:
5768 sys.stdout.write(stdout)
5769 if code != stdout:
5770 return_value = 2
5771 else:
5772 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5773 if opts.diff:
5774 sys.stdout.write(stdout)
5775 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005776 try:
5777 script = clang_format.FindClangFormatScriptInChromiumTree(
5778 'clang-format-diff.py')
5779 except clang_format.NotFoundError as e:
5780 DieWithError(e)
5781
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005782 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005783 if not opts.dry_run and not opts.diff:
5784 cmd.append('-i')
5785
5786 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005787 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005788
Edward Lesmes89624cd2020-04-06 17:51:56 +00005789 env = os.environ.copy()
5790 env['PATH'] = (
5791 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5792 stdout = RunCommand(
5793 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005794 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005795 if opts.diff:
5796 sys.stdout.write(stdout)
5797 if opts.dry_run and len(stdout) > 0:
5798 return_value = 2
5799
5800 return return_value
5801
5802
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005803def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5804 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5805 presubmit checks have failed (and returns 0 otherwise)."""
5806
5807 if not rust_diff_files:
5808 return 0
5809
5810 # Locate the rustfmt binary.
5811 try:
5812 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5813 except rustfmt.NotFoundError as e:
5814 DieWithError(e)
5815
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005816 # TODO(crbug.com/1440869): Support formatting only the changed lines
5817 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005818 cmd = [rustfmt_tool]
5819 if opts.dry_run:
5820 cmd.append('--check')
5821 cmd += rust_diff_files
5822 rustfmt_exitcode = subprocess2.call(cmd)
5823
5824 if opts.presubmit and rustfmt_exitcode != 0:
5825 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005826
5827 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005828
5829
Olivier Robin0a6b5442022-04-07 07:25:04 +00005830def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5831 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5832 that presubmit checks have failed (and returns 0 otherwise)."""
5833
5834 if not swift_diff_files:
5835 return 0
5836
5837 # Locate the swift-format binary.
5838 try:
5839 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5840 except swift_format.NotFoundError as e:
5841 DieWithError(e)
5842
5843 cmd = [swift_format_tool]
5844 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005845 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005846 else:
5847 cmd += ['format', '-i']
5848 cmd += swift_diff_files
5849 swift_format_exitcode = subprocess2.call(cmd)
5850
5851 if opts.presubmit and swift_format_exitcode != 0:
5852 return 2
5853
5854 return 0
5855
5856
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005857def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005858 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005859 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005860
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005861
enne@chromium.org555cfe42014-01-29 18:21:39 +00005862@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005863@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005864def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005865 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005866 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005867 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005868 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005869 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005870 parser.add_option('--full', action='store_true',
5871 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005872 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005873 parser.add_option('--dry-run', action='store_true',
5874 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005875 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005876 '--no-clang-format',
5877 dest='clang_format',
5878 action='store_false',
5879 default=True,
5880 help='Disables formatting of various file types using clang-format.')
5881 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005882 '--python',
5883 action='store_true',
5884 default=None,
5885 help='Enables python formatting on all python files.')
5886 parser.add_option(
5887 '--no-python',
5888 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005889 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005890 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005891 'If neither --python or --no-python are set, python files that have a '
5892 '.style.yapf file in an ancestor directory will be formatted. '
5893 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005894 parser.add_option(
5895 '--js',
5896 action='store_true',
5897 help='Format javascript code with clang-format. '
5898 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005899 parser.add_option('--diff', action='store_true',
5900 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005901 parser.add_option('--presubmit', action='store_true',
5902 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005903
5904 parser.add_option('--rust-fmt',
5905 dest='use_rust_fmt',
5906 action='store_true',
5907 default=rustfmt.IsRustfmtSupported(),
5908 help='Enables formatting of Rust file types using rustfmt.')
5909 parser.add_option(
5910 '--no-rust-fmt',
5911 dest='use_rust_fmt',
5912 action='store_false',
5913 help='Disables formatting of Rust file types using rustfmt.')
5914
Olivier Robin0a6b5442022-04-07 07:25:04 +00005915 parser.add_option(
5916 '--swift-format',
5917 dest='use_swift_format',
5918 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005919 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005920 help='Enables formatting of Swift file types using swift-format '
5921 '(macOS host only).')
5922 parser.add_option(
5923 '--no-swift-format',
5924 dest='use_swift_format',
5925 action='store_false',
5926 help='Disables formatting of Swift file types using swift-format.')
5927
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005928 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005929
Garrett Beaty91a6f332020-01-06 16:57:24 +00005930 if opts.python is not None and opts.no_python:
5931 raise parser.error('Cannot set both --python and --no-python')
5932 if opts.no_python:
5933 opts.python = False
5934
Daniel Chengc55eecf2016-12-30 03:11:02 -08005935 # Normalize any remaining args against the current path, so paths relative to
5936 # the current directory are still resolved as expected.
5937 args = [os.path.join(os.getcwd(), arg) for arg in args]
5938
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005939 # git diff generates paths against the root of the repository. Change
5940 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005941 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005942 if rel_base_path:
5943 os.chdir(rel_base_path)
5944
digit@chromium.org29e47272013-05-17 17:01:46 +00005945 # Grab the merge-base commit, i.e. the upstream commit of the current
5946 # branch when it was created or the last time it was rebased. This is
5947 # to cover the case where the user may have called "git fetch origin",
5948 # moving the origin branch to a newer commit, but hasn't rebased yet.
5949 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005950 upstream_branch = opts.upstream
5951 if not upstream_branch:
5952 cl = Changelist()
5953 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005954 if upstream_branch:
5955 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5956 upstream_commit = upstream_commit.strip()
5957
5958 if not upstream_commit:
5959 DieWithError('Could not find base commit for this branch. '
5960 'Are you in detached state?')
5961
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005962 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5963 diff_output = RunGit(changed_files_cmd)
5964 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005965 # Filter out files deleted by this CL
5966 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005967
Andreas Haas417d89c2020-02-06 10:24:27 +00005968 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005969 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005970
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005971 clang_diff_files = []
5972 if opts.clang_format:
5973 clang_diff_files = [
5974 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5975 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005976 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005977 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005978 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005979 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005980
Edward Lesmes50da7702020-03-30 19:23:43 +00005981 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005982
Jamie Madill5e96ad12020-01-13 16:08:35 +00005983 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5984 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005985
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005986 if opts.use_rust_fmt:
5987 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5988 upstream_commit)
5989 if rust_fmt_return_value == 2:
5990 return_value = 2
5991
Olivier Robin0a6b5442022-04-07 07:25:04 +00005992 if opts.use_swift_format:
5993 if sys.platform != 'darwin':
5994 DieWithError('swift-format is only supported on macOS.')
5995 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5996 upstream_commit)
5997 if swift_format_return_value == 2:
5998 return_value = 2
5999
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006000 # Similar code to above, but using yapf on .py files rather than clang-format
6001 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006002 py_explicitly_disabled = opts.python is not None and not opts.python
6003 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00006004 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6005 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006006
Aiden Bennerc08566e2018-10-03 17:52:42 +00006007 # Used for caching.
6008 yapf_configs = {}
6009 for f in python_diff_files:
6010 # Find the yapf style config for the current file, defaults to depot
6011 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006012 _FindYapfConfigFile(f, yapf_configs, top_dir)
6013
6014 # Turn on python formatting by default if a yapf config is specified.
6015 # This breaks in the case of this repo though since the specified
6016 # style file is also the global default.
6017 if opts.python is None:
6018 filtered_py_files = []
6019 for f in python_diff_files:
6020 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6021 filtered_py_files.append(f)
6022 else:
6023 filtered_py_files = python_diff_files
6024
6025 # Note: yapf still seems to fix indentation of the entire file
6026 # even if line ranges are specified.
6027 # See https://github.com/google/yapf/issues/499
6028 if not opts.full and filtered_py_files:
6029 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6030
Brian Sheedyb4307d52019-12-02 19:18:17 +00006031 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6032 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6033 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006034
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006035 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006036 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6037 # Default to pep8 if not .style.yapf is found.
6038 if not yapf_style:
6039 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006040
Peter Wend9399922020-06-17 17:33:49 +00006041 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006042 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006043 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006044 else:
6045 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006046
6047 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006048
6049 has_formattable_lines = False
6050 if not opts.full:
6051 # Only run yapf over changed line ranges.
6052 for diff_start, diff_len in py_line_diffs[f]:
6053 diff_end = diff_start + diff_len - 1
6054 # Yapf errors out if diff_end < diff_start but this
6055 # is a valid line range diff for a removal.
6056 if diff_end >= diff_start:
6057 has_formattable_lines = True
6058 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6059 # If all line diffs were removals we have nothing to format.
6060 if not has_formattable_lines:
6061 continue
6062
6063 if opts.diff or opts.dry_run:
6064 cmd += ['--diff']
6065 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006066 stdout = RunCommand(cmd,
6067 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006068 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006069 cwd=top_dir,
6070 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006071 if opts.diff:
6072 sys.stdout.write(stdout)
6073 elif len(stdout) > 0:
6074 return_value = 2
6075 else:
6076 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006077 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006078
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006079 # Format GN build files. Always run on full build files for canonical form.
6080 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006081 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006082 if opts.dry_run or opts.diff:
6083 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006084 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006085 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006086 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006087 cwd=top_dir)
6088 if opts.dry_run and gn_ret == 2:
6089 return_value = 2 # Not formatted.
6090 elif opts.diff and gn_ret == 2:
6091 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006092 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006093 elif gn_ret != 0:
6094 # For non-dry run cases (and non-2 return values for dry-run), a
6095 # nonzero error code indicates a failure, probably because the file
6096 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006097 DieWithError('gn format failed on ' + gn_diff_file +
6098 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006099
Ilya Shermane081cbe2017-08-15 17:51:04 -07006100 # Skip the metrics formatting from the global presubmit hook. These files have
6101 # a separate presubmit hook that issues an error if the files need formatting,
6102 # whereas the top-level presubmit script merely issues a warning. Formatting
6103 # these files is somewhat slow, so it's important not to duplicate the work.
6104 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006105 for diff_xml in GetDiffXMLs(diff_files):
6106 xml_dir = GetMetricsDir(diff_xml)
6107 if not xml_dir:
6108 continue
6109
Ilya Shermane081cbe2017-08-15 17:51:04 -07006110 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006111 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006112 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006113
6114 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6115 # command as histograms/pretty_print.py now needs a relative path argument
6116 # after splitting the histograms into multiple directories.
6117 # For example, in tools/metrics/ukm, pretty-print could be run using:
6118 # $ python pretty_print.py
6119 # But in tools/metrics/histogrmas, pretty-print should be run with an
6120 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006121 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006122 # $ python pretty_print.py enums.xml
6123
Alexei Svitkined40cda52023-08-29 21:24:41 +00006124 if xml_dir == os.path.join('tools', 'metrics', 'histograms'):
6125 if os.path.basename(diff_xml) not in ('histograms.xml', 'enums.xml',
6126 'histogram_suffixes_list.xml'):
6127 # Skip this XML file if it's not one of the known types.
6128 continue
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006129 cmd.append(diff_xml)
6130
Ilya Shermane081cbe2017-08-15 17:51:04 -07006131 if opts.dry_run or opts.diff:
6132 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006133
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006134 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6135 # `shell` param and instead replace `'vpython'` with
6136 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006137 stdout = RunCommand(cmd,
6138 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006139 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006140 if opts.diff:
6141 sys.stdout.write(stdout)
6142 if opts.dry_run and stdout:
6143 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006144
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006145 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006146
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006147
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006148def GetDiffXMLs(diff_files):
6149 return [
6150 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6151 ]
6152
6153
6154def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006155 metrics_xml_dirs = [
6156 os.path.join('tools', 'metrics', 'actions'),
6157 os.path.join('tools', 'metrics', 'histograms'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006158 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006159 os.path.join('tools', 'metrics', 'ukm'),
6160 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006161 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006162 if diff_xml.startswith(xml_dir):
6163 return xml_dir
6164 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006165
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006166
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006167@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006168@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006169def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006170 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006171 _, args = parser.parse_args(args)
6172
6173 if len(args) != 1:
6174 parser.print_help()
6175 return 1
6176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006177 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006178 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006179 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006180
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006181 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006182
Edward Lemur52969c92020-02-06 18:15:28 +00006183 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006184 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006185 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006186
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006187 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006188 for key, issue in [x.split() for x in output.splitlines()]:
6189 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006190 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006191
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006192 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006193 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006194 return 1
6195 if len(branches) == 1:
6196 RunGit(['checkout', branches[0]])
6197 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006198 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006199 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006200 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006201 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006202 try:
6203 RunGit(['checkout', branches[int(which)]])
6204 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006205 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006206 return 1
6207
6208 return 0
6209
6210
maruel@chromium.org29404b52014-09-08 22:58:00 +00006211def CMDlol(parser, args):
6212 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006213 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006214 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6215 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6216 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006217 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006218 return 0
6219
6220
Josip Sokcevic0399e172022-03-21 23:11:51 +00006221def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006222 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006223 print(utils.depot_tools_version())
6224
6225
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006226class OptionParser(optparse.OptionParser):
6227 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006228
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006229 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006230 optparse.OptionParser.__init__(
6231 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006232 self.add_option(
6233 '-v', '--verbose', action='count', default=0,
6234 help='Use 2 times for more debugging info')
6235
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006236 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006237 try:
6238 return self._parse_args(args)
6239 finally:
6240 # Regardless of success or failure of args parsing, we want to report
6241 # metrics, but only after logging has been initialized (if parsing
6242 # succeeded).
6243 global settings
6244 settings = Settings()
6245
Edward Lesmes9c349062021-05-06 20:02:39 +00006246 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006247 try:
6248 # GetViewVCUrl ultimately calls logging method.
6249 project_url = settings.GetViewVCUrl().strip('/+')
6250 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6251 metrics.collector.add('project_urls', [project_url])
6252 except subprocess2.CalledProcessError:
6253 # Occurs when command is not executed in a git repository
6254 # We should not fail here. If the command needs to be executed
6255 # in a repo, it will be raised later.
6256 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006257
6258 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006259 # Create an optparse.Values object that will store only the actual passed
6260 # options, without the defaults.
6261 actual_options = optparse.Values()
6262 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6263 # Create an optparse.Values object with the default options.
6264 options = optparse.Values(self.get_default_values().__dict__)
6265 # Update it with the options passed by the user.
6266 options._update_careful(actual_options.__dict__)
6267 # Store the options passed by the user in an _actual_options attribute.
6268 # We store only the keys, and not the values, since the values can contain
6269 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006270 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006271
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006272 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006273 logging.basicConfig(
6274 level=levels[min(options.verbose, len(levels) - 1)],
6275 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6276 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006277
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006278 return options, args
6279
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006280
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006281def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006282 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006283 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006284 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006285 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006286
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006287 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006288 dispatcher = subcommand.CommandDispatcher(__name__)
6289 try:
6290 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006291 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006292 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006293 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006294 if e.code != 500:
6295 raise
6296 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006297 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006298 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006299 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006300
6301
6302if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006303 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6304 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006305 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006306 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006307 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006308 sys.exit(main(sys.argv[1:]))