blob: d2acf19c5aacadb5649d8d7d37b0dc1f829b515a [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
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000033import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000034import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000035import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000036import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000037import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000038import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000039import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000040import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000041import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000042import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000043import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000044import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000045import presubmit_canned_checks
Josip Sokcevic7958e302023-03-01 23:02:21 +000046import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000047import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +000048import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000049import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040050import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000051import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000052import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000053import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000054import watchlists
55
Edward Lemur79d4f992019-11-11 23:49:02 +000056from six.moves import urllib
57
58
tandrii7400cf02016-06-21 08:48:07 -070059__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000060
Edward Lemur0f58ae42019-04-30 17:24:12 +000061# Traces for git push will be stored in a traces directory inside the
62# depot_tools checkout.
63DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
64TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000065PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000066
67# When collecting traces, Git hashes will be reduced to 6 characters to reduce
68# the size after compression.
69GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
70# Used to redact the cookies from the gitcookies file.
71GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
72
Edward Lemurd4d1ba42019-09-20 21:46:37 +000073MAX_ATTEMPTS = 3
74
Edward Lemur1b52d872019-05-09 21:12:12 +000075# The maximum number of traces we will keep. Multiplied by 3 since we store
76# 3 files per trace.
77MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000078# Message to be displayed to the user to inform where to find the traces for a
79# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000080TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000081'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000082'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000083' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000084'Copies of your gitcookies file and git config have been recorded at:\n'
85' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000086# Format of the message to be stored as part of the traces to give developers a
87# better context when they go through traces.
88TRACES_README_FORMAT = (
89'Date: %(now)s\n'
90'\n'
91'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
92'Title: %(title)s\n'
93'\n'
94'%(description)s\n'
95'\n'
96'Execution time: %(execution_time)s\n'
97'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000098
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080099POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000100DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000101REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000102 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
103 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000104}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000105
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000106DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
107DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
108
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000109DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
110
thestig@chromium.org44202a22014-03-11 19:22:18 +0000111# Valid extensions for files we want to lint.
112DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
113DEFAULT_LINT_IGNORE_REGEX = r"$^"
114
Aiden Bennerc08566e2018-10-03 17:52:42 +0000115# File name for yapf style config files.
116YAPF_CONFIG_FILENAME = '.style.yapf'
117
Edward Lesmes50da7702020-03-30 19:23:43 +0000118# The issue, patchset and codereview server are stored on git config for each
119# branch under branch.<branch-name>.<config-key>.
120ISSUE_CONFIG_KEY = 'gerritissue'
121PATCHSET_CONFIG_KEY = 'gerritpatchset'
122CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000123# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
124# you make to Gerrit. Instead, it creates a new commit object that contains all
125# changes you've made, diffed against a parent/merge base.
126# This is the hash of the new squashed commit and you can find this on Gerrit.
127GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
128# This is the latest uploaded local commit hash.
129LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000130
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000131# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000132Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000133
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000134# Initialized in main()
135settings = None
136
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100137# Used by tests/git_cl_test.py to add extra logging.
138# Inside the weirdly failing test, add this:
139# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700140# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100141_IS_BEING_TESTED = False
142
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000143_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000144
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000145_KNOWN_GERRIT_TO_SHORT_URLS = {
146 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
147 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
148}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000149assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
150 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000151
152
Joanna Wang18de1f62023-01-21 01:24:24 +0000153# Maximum number of branches in a stack that can be traversed and uploaded
154# at once. Picked arbitrarily.
155_MAX_STACKED_BRANCHES_UPLOAD = 20
156
157
Joanna Wang892f2ce2023-03-14 21:39:47 +0000158# Environment variable to indicate if user is participating in the stcked
159# changes dogfood.
160DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
161
162
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000163class GitPushError(Exception):
164 pass
165
166
Christopher Lamf732cd52017-01-24 12:40:11 +1100167def DieWithError(message, change_desc=None):
168 if change_desc:
169 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000170 print('\n ** Content of CL description **\n' +
171 '='*72 + '\n' +
172 change_desc.description + '\n' +
173 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100174
vapiera7fbd5a2016-06-16 09:17:49 -0700175 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000176 sys.exit(1)
177
178
Christopher Lamf732cd52017-01-24 12:40:11 +1100179def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000180 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000181 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000182 with open(backup_path, 'wb') as backup_file:
183 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100184
185
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000186def GetNoGitPagerEnv():
187 env = os.environ.copy()
188 # 'cat' is a magical git string that disables pagers on all platforms.
189 env['GIT_PAGER'] = 'cat'
190 return env
191
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000192
bsep@chromium.org627d9002016-04-29 00:00:52 +0000193def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000194 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000195 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
196 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000197 except subprocess2.CalledProcessError as e:
198 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000199 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000200 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
201 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000202 out = e.stdout.decode('utf-8', 'replace')
203 if e.stderr:
204 out += e.stderr.decode('utf-8', 'replace')
205 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000206
207
208def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000209 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000210 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000211
212
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000213def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000214 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700215 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000216 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700217 else:
218 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000219 try:
tandrii5d48c322016-08-18 16:19:37 -0700220 (out, _), code = subprocess2.communicate(['git'] + args,
221 env=GetNoGitPagerEnv(),
222 stdout=subprocess2.PIPE,
223 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000224 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700225 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900226 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000227 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000228
229
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000230def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000231 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000232 return RunGitWithCode(args, suppress_stderr=True)[1]
233
234
tandrii2a16b952016-10-19 07:09:44 -0700235def time_sleep(seconds):
236 # Use this so that it can be mocked in tests without interfering with python
237 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700238 return time.sleep(seconds)
239
240
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000241def time_time():
242 # Use this so that it can be mocked in tests without interfering with python
243 # system machinery.
244 return time.time()
245
246
Edward Lemur1b52d872019-05-09 21:12:12 +0000247def datetime_now():
248 # Use this so that it can be mocked in tests without interfering with python
249 # system machinery.
250 return datetime.datetime.now()
251
252
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100253def confirm_or_exit(prefix='', action='confirm'):
254 """Asks user to press enter to continue or press Ctrl+C to abort."""
255 if not prefix or prefix.endswith('\n'):
256 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100257 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100258 mid = ' Press'
259 elif prefix.endswith(' '):
260 mid = 'press'
261 else:
262 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000263 gclient_utils.AskForData(
264 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265
266
267def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000268 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000269 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100270 while True:
271 if 'yes'.startswith(result):
272 return True
273 if 'no'.startswith(result):
274 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000275 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100276
277
machenbach@chromium.org45453142015-09-15 08:45:22 +0000278def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000279 prop_list = getattr(options, 'properties', [])
280 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000281 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000282 try:
283 properties[key] = json.loads(val)
284 except ValueError:
285 pass # If a value couldn't be evaluated, treat it as a string.
286 return properties
287
288
Edward Lemur4c707a22019-09-24 21:13:43 +0000289def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000290 """Calls a buildbucket v2 method and returns the parsed json response."""
291 headers = {
292 'Accept': 'application/json',
293 'Content-Type': 'application/json',
294 }
295 request = json.dumps(request)
296 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
297
298 logging.info('POST %s with %s' % (url, request))
299
300 attempts = 1
301 time_to_sleep = 1
302 while True:
303 response, content = http.request(url, 'POST', body=request, headers=headers)
304 if response.status == 200:
305 return json.loads(content[4:])
306 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
307 msg = '%s error when calling POST %s with %s: %s' % (
308 response.status, url, request, content)
309 raise BuildbucketResponseException(msg)
310 logging.debug(
311 '%s error when calling POST %s with %s. '
312 'Sleeping for %d seconds and retrying...' % (
313 response.status, url, request, time_to_sleep))
314 time.sleep(time_to_sleep)
315 time_to_sleep *= 2
316 attempts += 1
317
318 assert False, 'unreachable'
319
320
Edward Lemur6215c792019-10-03 21:59:05 +0000321def _parse_bucket(raw_bucket):
322 legacy = True
323 project = bucket = None
324 if '/' in raw_bucket:
325 legacy = False
326 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000327 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000328 elif raw_bucket.startswith('luci.'):
329 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000330 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000331 elif '.' in raw_bucket:
332 project = raw_bucket.split('.')[0]
333 bucket = raw_bucket
334 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000335 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000336 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
337 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000338
339
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000340def _canonical_git_googlesource_host(host):
341 """Normalizes Gerrit hosts (with '-review') to Git host."""
342 assert host.endswith(_GOOGLESOURCE)
343 # Prefix doesn't include '.' at the end.
344 prefix = host[:-(1 + len(_GOOGLESOURCE))]
345 if prefix.endswith('-review'):
346 prefix = prefix[:-len('-review')]
347 return prefix + '.' + _GOOGLESOURCE
348
349
350def _canonical_gerrit_googlesource_host(host):
351 git_host = _canonical_git_googlesource_host(host)
352 prefix = git_host.split('.', 1)[0]
353 return prefix + '-review.' + _GOOGLESOURCE
354
355
356def _get_counterpart_host(host):
357 assert host.endswith(_GOOGLESOURCE)
358 git = _canonical_git_googlesource_host(host)
359 gerrit = _canonical_gerrit_googlesource_host(git)
360 return git if gerrit == host else gerrit
361
362
Quinten Yearsley777660f2020-03-04 23:37:06 +0000363def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000364 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700365
366 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000368 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700369 options: Command-line options.
370 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000371 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000372 for project, bucket, builder in jobs:
373 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000374 print('To see results here, run: git cl try-results')
375 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700376
Quinten Yearsley777660f2020-03-04 23:37:06 +0000377 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000378 if not requests:
379 return
380
Edward Lemur5b929a42019-10-21 17:57:39 +0000381 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000382 http.force_exception_to_status_code = True
383
384 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000385 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
386 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000387
388 errors = [
389 ' ' + response['error']['message']
390 for response in batch_response.get('responses', [])
391 if 'error' in response
392 ]
393 if errors:
394 raise BuildbucketResponseException(
395 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
396
397
Quinten Yearsley777660f2020-03-04 23:37:06 +0000398def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000399 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000400 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000401 shared_properties = {
402 'category': options.ensure_value('category', 'git_cl_try')
403 }
404 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000405 shared_properties['clobber'] = True
406 shared_properties.update(_get_properties_from_options(options) or {})
407
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000408 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000409 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000410 shared_tags.append({'key': 'retry_failed',
411 'value': '1'})
412
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000413 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000414 for (project, bucket, builder) in jobs:
415 properties = shared_properties.copy()
416 if 'presubmit' in builder.lower():
417 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000418
Edward Lemur45768512020-03-02 19:03:14 +0000419 requests.append({
420 'scheduleBuild': {
421 'requestId': str(uuid.uuid4()),
422 'builder': {
423 'project': getattr(options, 'project', None) or project,
424 'bucket': bucket,
425 'builder': builder,
426 },
427 'gerritChanges': gerrit_changes,
428 'properties': properties,
429 'tags': [
430 {'key': 'builder', 'value': builder},
431 ] + shared_tags,
432 }
433 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000434
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000435 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000436 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000437 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000438 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000439 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000440 'id': options.revision,
441 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000442 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000443
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000444 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000445
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000446
Quinten Yearsley777660f2020-03-04 23:37:06 +0000447def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000448 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000449
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000450 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000451 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000452 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000453 request = {
454 'predicate': {
455 'gerritChanges': [changelist.GetGerritChange(patchset)],
456 },
457 'fields': ','.join('builds.*.' + field for field in fields),
458 }
tandrii221ab252016-10-06 08:12:04 -0700459
Edward Lemur5b929a42019-10-21 17:57:39 +0000460 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000461 if authenticator.has_cached_credentials():
462 http = authenticator.authorize(httplib2.Http())
463 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700464 print('Warning: Some results might be missing because %s' %
465 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000466 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000467 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000468 http.force_exception_to_status_code = True
469
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000470 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
471 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000472
Edward Lemur45768512020-03-02 19:03:14 +0000473
Edward Lemur5b929a42019-10-21 17:57:39 +0000474def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000475 """Fetches builds from the latest patchset that has builds (within
476 the last few patchsets).
477
478 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000479 changelist (Changelist): The CL to fetch builds for
480 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000481 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
482 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000483 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000484 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
485 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 """
487 assert buildbucket_host
488 assert changelist.GetIssue(), 'CL must be uploaded first'
489 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000490 if latest_patchset is None:
491 assert changelist.GetMostRecentPatchset()
492 ps = changelist.GetMostRecentPatchset()
493 else:
494 assert latest_patchset > 0, latest_patchset
495 ps = latest_patchset
496
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 min_ps = max(1, ps - 5)
498 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000499 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000500 if len(builds):
501 return builds, ps
502 ps -= 1
503 return [], 0
504
505
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000506def _filter_failed_for_retry(all_builds):
507 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000508
509 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000510 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000511 i.e. a list of buildbucket.v2.Builds which includes status and builder
512 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000513
514 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000515 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000516 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000517 """
Edward Lemur45768512020-03-02 19:03:14 +0000518 grouped = {}
519 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000520 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000521 key = (builder['project'], builder['bucket'], builder['builder'])
522 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000523
Edward Lemur45768512020-03-02 19:03:14 +0000524 jobs = []
525 for (project, bucket, builder), builds in grouped.items():
526 if 'triggered' in builder:
527 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
528 'from a parent. Please schedule a manual job for the parent '
529 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530 continue
531 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
532 # Don't retry if any are running.
533 continue
Edward Lemur45768512020-03-02 19:03:14 +0000534 # If builder had several builds, retry only if the last one failed.
535 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
536 # build, but in case of retrying failed jobs retrying a flaky one makes
537 # sense.
538 builds = sorted(builds, key=lambda b: b['createTime'])
539 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
540 continue
541 # Don't retry experimental build previously triggered by CQ.
542 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
543 for t in builds[-1]['tags']):
544 continue
545 jobs.append((project, bucket, builder))
546
547 # Sort the jobs to make testing easier.
548 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000549
550
Quinten Yearsley777660f2020-03-04 23:37:06 +0000551def _print_tryjobs(options, builds):
552 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000554 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000555 return
556
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000557 longest_builder = max(len(b['builder']['builder']) for b in builds)
558 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000560 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
561 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 builds_by_status = {}
564 for b in builds:
565 builds_by_status.setdefault(b['status'], []).append({
566 'id': b['id'],
567 'name': name_fmt.format(
568 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
569 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000571 sort_key = lambda b: (b['name'], b['id'])
572
573 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000574 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 if not builds:
576 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000579 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000580 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 else:
582 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
583
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 print(colorize(title))
585 for b in sorted(builds, key=sort_key):
586 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000587
588 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 print_builds(
590 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
591 print_builds(
592 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
593 color=Fore.MAGENTA)
594 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
595 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
596 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000597 print_builds('Started:', builds_by_status.pop('STARTED', []),
598 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000599 print_builds(
600 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000602 print_builds(
603 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000604 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000605
606
Aiden Bennerc08566e2018-10-03 17:52:42 +0000607def _ComputeDiffLineRanges(files, upstream_commit):
608 """Gets the changed line ranges for each file since upstream_commit.
609
610 Parses a git diff on provided files and returns a dict that maps a file name
611 to an ordered list of range tuples in the form (start_line, count).
612 Ranges are in the same format as a git diff.
613 """
614 # If files is empty then diff_output will be a full diff.
615 if len(files) == 0:
616 return {}
617
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000618 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000619 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000620 diff_output = RunGit(diff_cmd)
621
622 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
623 # 2 capture groups
624 # 0 == fname of diff file
625 # 1 == 'diff_start,diff_count' or 'diff_start'
626 # will match each of
627 # diff --git a/foo.foo b/foo.py
628 # @@ -12,2 +14,3 @@
629 # @@ -12,2 +17 @@
630 # running re.findall on the above string with pattern will give
631 # [('foo.py', ''), ('', '14,3'), ('', '17')]
632
633 curr_file = None
634 line_diffs = {}
635 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
636 if match[0] != '':
637 # Will match the second filename in diff --git a/a.py b/b.py.
638 curr_file = match[0]
639 line_diffs[curr_file] = []
640 else:
641 # Matches +14,3
642 if ',' in match[1]:
643 diff_start, diff_count = match[1].split(',')
644 else:
645 # Single line changes are of the form +12 instead of +12,1.
646 diff_start = match[1]
647 diff_count = 1
648
649 diff_start = int(diff_start)
650 diff_count = int(diff_count)
651
652 # If diff_count == 0 this is a removal we can ignore.
653 line_diffs[curr_file].append((diff_start, diff_count))
654
655 return line_diffs
656
657
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000658def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000659 """Checks if a yapf file is in any parent directory of fpath until top_dir.
660
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000661 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000662 is found returns None. Uses yapf_config_cache as a cache for previously found
663 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000664 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 # Return result if we've already computed it.
667 if fpath in yapf_config_cache:
668 return yapf_config_cache[fpath]
669
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000670 parent_dir = os.path.dirname(fpath)
671 if os.path.isfile(fpath):
672 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000674 # Otherwise fpath is a directory
675 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
676 if os.path.isfile(yapf_file):
677 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000678 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000679 # If we're at the top level directory, or if we're at root
680 # there is no provided style.
681 ret = None
682 else:
683 # Otherwise recurse on the current directory.
684 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685 yapf_config_cache[fpath] = ret
686 return ret
687
688
Brian Sheedyb4307d52019-12-02 19:18:17 +0000689def _GetYapfIgnorePatterns(top_dir):
690 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000691
692 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
693 but this functionality appears to break when explicitly passing files to
694 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000695 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000696 the .yapfignore file should be in the directory that yapf is invoked from,
697 which we assume to be the top level directory in this case.
698
699 Args:
700 top_dir: The top level directory for the repository being formatted.
701
702 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000703 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000704 """
705 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000706 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000707 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000708 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000709
Anthony Politoc64e3902021-04-30 21:55:25 +0000710 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
711 stripped_line = line.strip()
712 # Comments and blank lines should be ignored.
713 if stripped_line.startswith('#') or stripped_line == '':
714 continue
715 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000716 return ignore_patterns
717
718
719def _FilterYapfIgnoredFiles(filepaths, patterns):
720 """Filters out any filepaths that match any of the given patterns.
721
722 Args:
723 filepaths: An iterable of strings containing filepaths to filter.
724 patterns: An iterable of strings containing fnmatch patterns to filter on.
725
726 Returns:
727 A list of strings containing all the elements of |filepaths| that did not
728 match any of the patterns in |patterns|.
729 """
730 # Not inlined so that tests can use the same implementation.
731 return [f for f in filepaths
732 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000733
734
Aaron Gable13101a62018-02-09 13:20:41 -0800735def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000744 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800745 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000746 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000747
748
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000749class BuildbucketResponseException(Exception):
750 pass
751
752
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000753class Settings(object):
754 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000755 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000756 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 self.tree_status_url = None
758 self.viewvc_url = None
759 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000760 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000761 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000762 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000763 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000764 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000765 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766
Edward Lemur26964072020-02-19 19:18:51 +0000767 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000769 if self.updated:
770 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000771
Edward Lemur26964072020-02-19 19:18:51 +0000772 # The only value that actually changes the behavior is
773 # autoupdate = "false". Everything else means "true".
774 autoupdate = (
775 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
776
777 cr_settings_file = FindCodereviewSettingsFile()
778 if autoupdate != 'false' and cr_settings_file:
779 LoadCodereviewSettingsFromFile(cr_settings_file)
780 cr_settings_file.close()
781
782 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000784 @staticmethod
785 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000786 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000789 if self.root is None:
790 self.root = os.path.abspath(self.GetRelativeRoot())
791 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 def GetTreeStatusUrl(self, error_ok=False):
794 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000795 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
796 if self.tree_status_url is None and not error_ok:
797 DieWithError(
798 'You must configure your tree status URL by running '
799 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 return self.tree_status_url
801
802 def GetViewVCUrl(self):
803 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000804 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 return self.viewvc_url
806
rmistry@google.com90752582014-01-14 21:04:50 +0000807 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000808 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000809
rmistry@google.com5626a922015-02-26 14:03:30 +0000810 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000811 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000812 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000813 return run_post_upload_hook == "True"
814
Joanna Wangc8f23e22023-01-19 21:18:10 +0000815 def GetDefaultCCList(self):
816 return self._GetConfig('rietveld.cc')
817
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000818 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000819 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000820 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000821 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
822 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000823 # Default is squash now (http://crbug.com/611892#c23).
824 self.squash_gerrit_uploads = self._GetConfig(
825 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000826 return self.squash_gerrit_uploads
827
Edward Lesmes4de54132020-05-05 19:41:33 +0000828 def GetSquashGerritUploadsOverride(self):
829 """Return True or False if codereview.settings should be overridden.
830
831 Returns None if no override has been defined.
832 """
833 # See also http://crbug.com/611892#c23
834 result = self._GetConfig('gerrit.override-squash-uploads').lower()
835 if result == 'true':
836 return True
837 if result == 'false':
838 return False
839 return None
840
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000841 def GetIsGerrit(self):
842 """Return True if gerrit.host is set."""
843 if self.is_gerrit is None:
844 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
845 return self.is_gerrit
846
tandrii@chromium.org28253532016-04-14 13:46:56 +0000847 def GetGerritSkipEnsureAuthenticated(self):
848 """Return True if EnsureAuthenticated should not be done for Gerrit
849 uploads."""
850 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000851 self.gerrit_skip_ensure_authenticated = self._GetConfig(
852 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000853 return self.gerrit_skip_ensure_authenticated
854
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000855 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000856 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000857 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000858 # Git requires single quotes for paths with spaces. We need to replace
859 # them with double quotes for Windows to treat such paths as a single
860 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000861 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000862 return self.git_editor or None
863
thestig@chromium.org44202a22014-03-11 19:22:18 +0000864 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000865 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000866
867 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000868 return self._GetConfig(
869 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000870
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000871 def GetFormatFullByDefault(self):
872 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000873 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000874 result = (
875 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
876 error_ok=True).strip())
877 self.format_full_by_default = (result == 'true')
878 return self.format_full_by_default
879
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000880 def IsStatusCommitOrderByDate(self):
881 if self.is_status_commit_order_by_date is None:
882 result = (RunGit(['config', '--bool', 'cl.date-order'],
883 error_ok=True).strip())
884 self.is_status_commit_order_by_date = (result == 'true')
885 return self.is_status_commit_order_by_date
886
Edward Lemur26964072020-02-19 19:18:51 +0000887 def _GetConfig(self, key, default=''):
888 self._LazyUpdateIfNeeded()
889 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000890
891
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000892class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000893 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000894 NONE = 'none'
895 DRY_RUN = 'dry_run'
896 COMMIT = 'commit'
897
Struan Shrimpton8b2072b2023-07-31 21:01:26 +0000898 ALL_STATES = [NONE, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000899
900
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000901class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000902 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000903 self.issue = issue
904 self.patchset = patchset
905 self.hostname = hostname
906
907 @property
908 def valid(self):
909 return self.issue is not None
910
911
Edward Lemurf38bc172019-09-03 21:02:13 +0000912def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000913 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
914 fail_result = _ParsedIssueNumberArgument()
915
Edward Lemur678a6842019-10-03 22:25:05 +0000916 if isinstance(arg, int):
917 return _ParsedIssueNumberArgument(issue=arg)
Gavin Makcc976552023-08-28 17:01:52 +0000918 if not isinstance(arg, str):
Edward Lemur678a6842019-10-03 22:25:05 +0000919 return fail_result
920
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000922 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700923
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000925 if not url.startswith('http'):
926 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000927 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
928 if url.startswith(short_url):
929 url = gerrit_url + url[len(short_url):]
930 break
931
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000933 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000934 except ValueError:
935 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200936
Alex Turner30ae6372022-01-04 02:32:52 +0000937 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
938 # URL.
939 if not arg.startswith('http') and '.' not in parsed_url.netloc:
940 return fail_result
941
Edward Lemur678a6842019-10-03 22:25:05 +0000942 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
943 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
944 # Short urls like https://domain/<issue_number> can be used, but don't allow
945 # specifying the patchset (you'd 404), but we allow that here.
946 if parsed_url.path == '/':
947 part = parsed_url.fragment
948 else:
949 part = parsed_url.path
950
951 match = re.match(
952 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
953 if not match:
954 return fail_result
955
956 issue = int(match.group('issue'))
957 patchset = match.group('patchset')
958 return _ParsedIssueNumberArgument(
959 issue=issue,
960 patchset=int(patchset) if patchset else None,
961 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000962
963
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000964def _create_description_from_log(args):
965 """Pulls out the commit log to use as a base for the CL description."""
966 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000967 if len(args) == 1 and args[0] == None:
968 # Handle the case where None is passed as the branch.
969 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000970 if len(args) == 1 and not args[0].endswith('.'):
971 log_args = [args[0] + '..']
972 elif len(args) == 1 and args[0].endswith('...'):
973 log_args = [args[0][:-1]]
974 elif len(args) == 2:
975 log_args = [args[0] + '..' + args[1]]
976 else:
977 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000978 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000979
980
Aaron Gablea45ee112016-11-22 15:14:38 -0800981class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700982 def __init__(self, issue, url):
983 self.issue = issue
984 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800985 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700986
987 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800988 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700989 self.issue, self.url)
990
991
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100992_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000993 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100994 # TODO(tandrii): these two aren't known in Gerrit.
995 'approval', 'disapproval'])
996
997
Joanna Wang6215dd02023-02-07 15:58:03 +0000998# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +0000999_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001000 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001001 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001002])
1003
1004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001006 """Changelist works with one changelist in local branch.
1007
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001008 Notes:
1009 * Not safe for concurrent multi-{thread,process} use.
1010 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001011 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 """
1013
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001014 def __init__(self,
1015 branchref=None,
1016 issue=None,
1017 codereview_host=None,
1018 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """Create a new ChangeList instance.
1020
Edward Lemurf38bc172019-09-03 21:02:13 +00001021 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001024 global settings
1025 if not settings:
1026 # Happens when git_cl.py is used as a utility library.
1027 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001028
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 self.branchref = branchref
1030 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001031 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001032 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033 else:
1034 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001035 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001037 self.lookedup_issue = False
1038 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001040 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001042 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001043 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001044 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001045 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001046
Edward Lemur125d60a2019-09-13 18:25:41 +00001047 # Lazily cached values.
1048 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1049 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001050 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001051 # Map from change number (issue) to its detail cache.
1052 self._detail_cache = {}
1053
1054 if codereview_host is not None:
1055 assert not codereview_host.startswith('https://'), codereview_host
1056 self._gerrit_host = codereview_host
1057 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001058
Edward Lesmese1576912021-02-16 21:53:34 +00001059 @property
1060 def owners_client(self):
1061 if self._owners_client is None:
1062 remote, remote_branch = self.GetRemoteBranch()
1063 branch = GetTargetRef(remote, remote_branch, None)
1064 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001065 host=self.GetGerritHost(),
1066 project=self.GetGerritProject(),
1067 branch=branch)
1068 return self._owners_client
1069
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001070 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001071 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001072
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001073 The return value is a string suitable for passing to git cl with the --cc
1074 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001075 """
1076 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001077 base_cc = settings.GetDefaultCCList()
1078 more_cc = ','.join(self.more_cc)
1079 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001080 return self.cc
1081
Daniel Cheng7227d212017-11-17 08:12:37 -08001082 def ExtendCC(self, more_cc):
1083 """Extends the list of users to cc on this CL based on the changed files."""
1084 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001086 def GetCommitDate(self):
1087 """Returns the commit date as provided in the constructor"""
1088 return self.commit_date
1089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001091 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001093 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001094 if not branchref:
1095 return None
1096 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001097 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 return self.branch
1099
1100 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001101 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 self.GetBranch() # Poke the lazy loader.
1103 return self.branchref
1104
Edward Lemur85153282020-02-14 22:06:29 +00001105 def _GitGetBranchConfigValue(self, key, default=None):
1106 return scm.GIT.GetBranchConfig(
1107 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001108
Edward Lemur85153282020-02-14 22:06:29 +00001109 def _GitSetBranchConfigValue(self, key, value):
1110 action = 'set %s to %r' % (key, value)
1111 if not value:
1112 action = 'unset %s' % key
1113 assert self.GetBranch(), 'a branch is needed to ' + action
1114 return scm.GIT.SetBranchConfig(
1115 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001116
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001117 @staticmethod
1118 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001119 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001120 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001122 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1123 settings.GetRoot(), branch)
1124 if not remote or not upstream_branch:
1125 DieWithError(
1126 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001127 'Verify this branch is set up to track another \n'
1128 '(via the --track argument to "git checkout -b ..."). \n'
1129 'or pass complete "git diff"-style arguments if supported, like\n'
1130 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131
1132 return remote, upstream_branch
1133
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001134 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001135 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001136 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001137 DieWithError('The upstream for the current branch (%s) does not exist '
1138 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001139 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001140 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001141
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 def GetUpstreamBranch(self):
1143 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001144 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001145 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001146 upstream_branch = upstream_branch.replace('refs/heads/',
1147 'refs/remotes/%s/' % remote)
1148 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1149 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.upstream_branch = upstream_branch
1151 return self.upstream_branch
1152
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001153 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001154 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 remote, branch = None, self.GetBranch()
1156 seen_branches = set()
1157 while branch not in seen_branches:
1158 seen_branches.add(branch)
1159 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001160 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 if remote != '.' or branch.startswith('refs/remotes'):
1162 break
1163 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001164 remotes = RunGit(['remote'], error_ok=True).split()
1165 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001167 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001169 logging.warning('Could not determine which remote this change is '
1170 'associated with, so defaulting to "%s".' %
1171 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 else:
Gavin Make6a62332020-12-04 21:57:10 +00001173 logging.warning('Could not determine which remote this change is '
1174 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 branch = 'HEAD'
1176 if branch.startswith('refs/remotes'):
1177 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001178 elif branch.startswith('refs/branch-heads/'):
1179 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 else:
1181 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 return self._remote
1183
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001184 def GetRemoteUrl(self):
1185 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1186
1187 Returns None if there is no remote.
1188 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001189 is_cached, value = self._cached_remote_url
1190 if is_cached:
1191 return value
1192
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001194 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001195
Edward Lemur298f2cf2019-02-22 21:40:39 +00001196 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001197 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001198 if host:
1199 self._cached_remote_url = (True, url)
1200 return url
1201
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001202 # If it cannot be parsed as an url, assume it is a local directory,
1203 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001204 logging.warning('"%s" doesn\'t appear to point to a git host. '
1205 'Interpreting it as a local directory.', url)
1206 if not os.path.isdir(url):
1207 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001208 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1209 'but it doesn\'t exist.',
1210 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 return None
1212
1213 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001214 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001215
Edward Lemur79d4f992019-11-11 23:49:02 +00001216 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 if not host:
1218 logging.error(
1219 'Remote "%(remote)s" for branch "%(branch)s" points to '
1220 '"%(cache_path)s", but it is misconfigured.\n'
1221 '"%(cache_path)s" must be a git repo and must have a remote named '
1222 '"%(remote)s" pointing to the git host.', {
1223 'remote': remote,
1224 'cache_path': cache_path,
1225 'branch': self.GetBranch()})
1226 return None
1227
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001228 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001229 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001231 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001232 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001233 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001234 if self.GetBranch():
1235 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001236 if self.issue is not None:
1237 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001238 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001239 return self.issue
1240
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001241 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001243 issue = self.GetIssue()
1244 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001245 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001246 server = self.GetCodereviewServer()
1247 if short:
1248 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1249 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250
Edward Lemur6c6827c2020-02-06 21:15:18 +00001251 def FetchDescription(self, pretty=False):
1252 assert self.GetIssue(), 'issue is required to query Gerrit'
1253
Edward Lemur9aa1a962020-02-25 00:58:38 +00001254 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001255 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1256 current_rev = data['current_revision']
1257 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001258
1259 if not pretty:
1260 return self.description
1261
1262 # Set width to 72 columns + 2 space indent.
1263 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1264 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1265 lines = self.description.splitlines()
1266 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267
1268 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001269 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001270 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001271 if self.GetBranch():
1272 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001273 if self.patchset is not None:
1274 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001275 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001276 return self.patchset
1277
Edward Lemur9aa1a962020-02-25 00:58:38 +00001278 def GetAuthor(self):
1279 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1280
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001281 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001282 """Set this branch's patchset. If patchset=0, clears the patchset."""
1283 assert self.GetBranch()
1284 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001285 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001286 else:
1287 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001288 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001290 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001291 """Set this branch's issue. If issue isn't given, clears the issue."""
1292 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001294 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001295 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001296 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001297 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001298 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001299 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001300 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 else:
tandrii5d48c322016-08-18 16:19:37 -07001302 # Reset all of these just to be clean.
1303 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001304 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001305 ISSUE_CONFIG_KEY,
1306 PATCHSET_CONFIG_KEY,
1307 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001308 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 ]
tandrii5d48c322016-08-18 16:19:37 -07001310 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001311 try:
1312 self._GitSetBranchConfigValue(prop, None)
1313 except subprocess2.CalledProcessError:
1314 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001315 msg = RunGit(['log', '-1', '--format=%B']).strip()
1316 if msg and git_footers.get_footer_change_id(msg):
1317 print('WARNING: The change patched into this branch has a Change-Id. '
1318 'Removing it.')
1319 RunGit(['commit', '--amend', '-m',
1320 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001321 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001322 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001323 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001324
Joanna Wangb46232e2023-01-21 01:58:46 +00001325 def GetAffectedFiles(self, upstream, end_commit=None):
1326 # type: (str, Optional[str]) -> Sequence[str]
1327 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001328 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001329 return [
1330 f for _, f in scm.GIT.CaptureStatus(
1331 settings.GetRoot(), upstream, end_commit=end_commit)
1332 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001333 except subprocess2.CalledProcessError:
1334 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001335 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001336 'This branch probably doesn\'t exist anymore. To reset the\n'
1337 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001338 ' git branch --set-upstream-to origin/main %s\n'
1339 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001340 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001341
dsansomee2d6fd92016-09-08 00:10:47 -07001342 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001343 assert self.GetIssue(), 'issue is required to update description'
1344
1345 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001346 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001347 if not force:
1348 confirm_or_exit(
1349 'The description cannot be modified while the issue has a pending '
1350 'unpublished edit. Either publish the edit in the Gerrit web UI '
1351 'or delete it.\n\n', action='delete the unpublished edit')
1352
1353 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001354 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001355 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001356 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001357 description, notify='NONE')
1358
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001359 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001360
Edward Lemur75526302020-02-27 22:31:05 +00001361 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001362 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001363 '--root', settings.GetRoot(),
1364 '--upstream', upstream,
1365 ]
1366
1367 args.extend(['--verbose'] * verbose)
1368
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001369 remote, remote_branch = self.GetRemoteBranch()
1370 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001371 if settings.GetIsGerrit():
1372 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1373 args.extend(['--gerrit_project', self.GetGerritProject()])
1374 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001375
Edward Lemur99df04e2020-03-05 19:39:43 +00001376 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001377 issue = self.GetIssue()
1378 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001379 if author:
1380 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001381 if issue:
1382 args.extend(['--issue', str(issue)])
1383 if patchset:
1384 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001385
Edward Lemur75526302020-02-27 22:31:05 +00001386 return args
1387
Josip Sokcevic017544d2022-03-31 23:47:53 +00001388 def RunHook(self,
1389 committing,
1390 may_prompt,
1391 verbose,
1392 parallel,
1393 upstream,
1394 description,
1395 all_files,
1396 files=None,
1397 resultdb=False,
1398 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001399 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1400 args = self._GetCommonPresubmitArgs(verbose, upstream)
1401 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001402 if may_prompt:
1403 args.append('--may_prompt')
1404 if parallel:
1405 args.append('--parallel')
1406 if all_files:
1407 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001408 if files:
1409 args.extend(files.split(';'))
1410 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001411 if files or all_files:
1412 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001413
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001414 if resultdb and not realm:
1415 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1416 # it is not required to pass the realm flag
1417 print('Note: ResultDB reporting will NOT be performed because --realm'
1418 ' was not specified. To enable ResultDB, please run the command'
1419 ' again with the --realm argument to specify the LUCI realm.')
1420
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001421 return self._RunPresubmit(args,
1422 description,
1423 resultdb=resultdb,
1424 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001425
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001426 def _RunPresubmit(self,
1427 args,
1428 description,
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001429 resultdb=None,
1430 realm=None):
1431 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1432 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001433 args = args[:]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001434
Edward Lemur227d5102020-02-25 23:45:35 +00001435 with gclient_utils.temporary_file() as description_file:
1436 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001437 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001438 args.extend(['--json_output', json_output])
1439 args.extend(['--description_file', description_file])
Edward Lemur227d5102020-02-25 23:45:35 +00001440 start = time_time()
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001441 cmd = ['vpython3', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001442 if resultdb and realm:
1443 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001444
1445 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001446 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001447
Edward Lemur227d5102020-02-25 23:45:35 +00001448 metrics.collector.add_repeated('sub_commands', {
1449 'command': 'presubmit',
1450 'execution_time': time_time() - start,
1451 'exit_code': exit_code,
1452 })
1453
1454 if exit_code:
1455 sys.exit(exit_code)
1456
1457 json_results = gclient_utils.FileRead(json_output)
1458 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001459
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001460 def RunPostUploadHook(self, verbose, upstream, description):
Edward Lemur75526302020-02-27 22:31:05 +00001461 args = self._GetCommonPresubmitArgs(verbose, upstream)
1462 args.append('--post_upload')
1463
1464 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001465 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001466 args.extend(['--description_file', description_file])
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001467 subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args).wait()
Edward Lemur75526302020-02-27 22:31:05 +00001468
Edward Lemur5a644f82020-03-18 16:44:57 +00001469 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001470 # type: (optparse.Values, Sequence[str], Sequence[str]
1471 # ) -> ChangeDescription
1472 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001473 if self.GetIssue():
1474 description = self.FetchDescription()
1475 elif options.message:
1476 description = options.message
1477 else:
1478 description = _create_description_from_log(git_diff_args)
1479 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001480 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001481
Edward Lemur5a644f82020-03-18 16:44:57 +00001482 bug = options.bug
1483 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001484 if not self.GetIssue():
1485 # Extract bug number from branch name, but only if issue is being created.
1486 # It must start with bug or fix, followed by _ or - and number.
1487 # Optionally, it may contain _ or - after number with arbitrary text.
1488 # Examples:
1489 # bug-123
1490 # bug_123
1491 # fix-123
1492 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001493 branch = self.GetBranch()
1494 if branch is not None:
1495 match = re.match(
1496 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1497 if not bug and not fixed and match:
1498 if match.group('type') == 'bug':
1499 bug = match.group('bugnum')
1500 else:
1501 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001502
1503 change_description = ChangeDescription(description, bug, fixed)
1504
Joanna Wang39811b12023-01-20 23:09:48 +00001505 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001506 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001507 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001508 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001509 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001510 missing_files = [
1511 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001512 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001513 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001514 owners = self.owners_client.SuggestOwners(
1515 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001516 assert isinstance(options.reviewers, list), options.reviewers
1517 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001518
Edward Lemur5a644f82020-03-18 16:44:57 +00001519 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001520 if options.reviewers:
1521 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001522
1523 return change_description
1524
Joanna Wanga1abbed2023-01-24 01:41:05 +00001525 def _GetTitleForUpload(self, options, multi_change_upload=False):
1526 # type: (optparse.Values, Optional[bool]) -> str
1527
1528 # Getting titles for multipl commits is not supported so we return the
1529 # default.
1530 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001531 return options.title
1532
1533 # On first upload, patchset title is always this string, while options.title
1534 # gets converted to first line of message.
1535 if not self.GetIssue():
1536 return 'Initial upload'
1537
1538 # When uploading subsequent patchsets, options.message is taken as the title
1539 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001540 if options.message:
1541 return options.message.strip()
1542
1543 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001544 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001545 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001546 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001547 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001548
1549 # Use the default title if the user confirms the default with a 'y'.
1550 if user_title.lower() == 'y':
1551 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001552 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001553
Joanna Wang562481d2023-01-26 21:57:14 +00001554 def _GetRefSpecOptions(self,
1555 options,
1556 change_desc,
1557 multi_change_upload=False,
1558 dogfood_path=False):
1559 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1560 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001561
1562 # Extra options that can be specified at push time. Doc:
1563 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1564 refspec_opts = []
1565
1566 # By default, new changes are started in WIP mode, and subsequent patchsets
1567 # don't send email. At any time, passing --send-mail or --send-email will
1568 # mark the change ready and send email for that particular patch.
1569 if options.send_mail:
1570 refspec_opts.append('ready')
1571 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001572 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001573 refspec_opts.append('wip')
Joanna Wangcea35a32023-08-28 21:30:59 +00001574 else:
1575 refspec_opts.append('notify=NONE')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001576
1577 # TODO(tandrii): options.message should be posted as a comment if
1578 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1579 # to do it.
1580
1581 # Set options.title in case user was prompted in _GetTitleForUpload and
1582 # _CMDUploadChange needs to be called again.
1583 options.title = self._GetTitleForUpload(
1584 options, multi_change_upload=multi_change_upload)
1585
1586 if options.title:
1587 # Punctuation and whitespace in |title| must be percent-encoded.
1588 refspec_opts.append('m=' +
1589 gerrit_util.PercentEncodeForGitRef(options.title))
1590
1591 if options.private:
1592 refspec_opts.append('private')
1593
1594 if options.topic:
1595 # Documentation on Gerrit topics is here:
1596 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1597 refspec_opts.append('topic=%s' % options.topic)
1598
1599 if options.enable_auto_submit:
1600 refspec_opts.append('l=Auto-Submit+1')
1601 if options.set_bot_commit:
1602 refspec_opts.append('l=Bot-Commit+1')
1603 if options.use_commit_queue:
1604 refspec_opts.append('l=Commit-Queue+2')
1605 elif options.cq_dry_run:
1606 refspec_opts.append('l=Commit-Queue+1')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001607
1608 if change_desc.get_reviewers(tbr_only=True):
1609 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1610 self.GetGerritProject())
1611 refspec_opts.append('l=Code-Review+%s' % score)
1612
Joanna Wang40497912023-01-24 21:18:16 +00001613 # Gerrit sorts hashtags, so order is not important.
1614 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1615 # We check GetIssue because we only add hashtags from the
1616 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001617 # TODO(b/265929888): When we fully launch the new path:
1618 # 1) remove fetching hashtags from description alltogether
1619 # 2) Or use descrtiption hashtags for:
1620 # `not (self.GetIssue() and multi_change_upload)`
1621 # 3) Or enabled change description tags for multi and single changes
1622 # by adding them post `git push`.
1623 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001624 hashtags.update(change_desc.get_hash_tags())
1625 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001626
1627 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001628 # branch/change.
1629 return refspec_opts
1630
Joanna Wang05b60342023-03-29 20:25:57 +00001631 def PrepareSquashedCommit(self,
1632 options,
1633 parent,
1634 orig_parent,
1635 end_commit=None):
1636 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1637 """Create a squashed commit to upload.
1638
1639
1640 Args:
1641 parent: The commit to use as the parent for the new squashed.
1642 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1643 is part of the same original tree as end_commit, which does not
1644 contain squashed commits. This is used to create the change
1645 description for the new squashed commit with:
1646 `git log orig_parent..end_commit`.
1647 end_commit: The commit to use as the end of the new squashed commit.
1648 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001649
1650 if end_commit is None:
1651 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1652
Joanna Wang05b60342023-03-29 20:25:57 +00001653 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001654 end_commit)
1655 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1656 with gclient_utils.temporary_file() as desc_tempfile:
1657 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1658 commit_to_push = RunGit(
1659 ['commit-tree', latest_tree, '-p', parent, '-F',
1660 desc_tempfile]).strip()
1661
Joanna Wang7603f042023-03-01 22:17:36 +00001662 # Gerrit may or may not update fast enough to return the correct patchset
1663 # number after we push. Get the pre-upload patchset and increment later.
1664 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001665 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001666 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001667
Joanna Wang6215dd02023-02-07 15:58:03 +00001668 def PrepareCherryPickSquashedCommit(self, options, parent):
1669 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001670 """Create a commit cherry-picked on parent to push."""
1671
Joanna Wang6215dd02023-02-07 15:58:03 +00001672 # The `parent` is what we will cherry-pick on top of.
1673 # The `cherry_pick_base` is the beginning range of what
1674 # we are cherry-picking.
1675 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1676 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001677 self.branchref)
1678
1679 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1680 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1681 with gclient_utils.temporary_file() as desc_tempfile:
1682 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001683 commit_to_cp = RunGit([
1684 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1685 desc_tempfile
1686 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001687
Joanna Wang6215dd02023-02-07 15:58:03 +00001688 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001689 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1690 if ret:
1691 RunGit(['cherry-pick', '--abort'])
1692 RunGit(['checkout', '-q', self.branch])
1693 DieWithError('Could not cleanly cherry-pick')
1694
Joanna Wang6215dd02023-02-07 15:58:03 +00001695 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001696 RunGit(['checkout', '-q', self.branch])
1697
Joanna Wang7603f042023-03-01 22:17:36 +00001698 # Gerrit may or may not update fast enough to return the correct patchset
1699 # number after we push. Get the pre-upload patchset and increment later.
1700 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001701 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001702 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001703
Joanna Wangb46232e2023-01-21 01:58:46 +00001704 def _PrepareChange(self, options, parent, end_commit):
1705 # type: (optparse.Values, str, str) ->
1706 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1707 """Prepares the change to be uploaded."""
1708 self.EnsureCanUploadPatchset(options.force)
1709
1710 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1711 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1712 files)
1713
1714 watchlist = watchlists.Watchlists(settings.GetRoot())
1715 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1716 if not options.bypass_hooks:
1717 hook_results = self.RunHook(committing=False,
1718 may_prompt=not options.force,
1719 verbose=options.verbose,
1720 parallel=options.parallel,
1721 upstream=parent,
1722 description=change_desc.description,
1723 all_files=False)
1724 self.ExtendCC(hook_results['more_cc'])
1725
1726 # Update the change description and ensure we have a Change Id.
1727 if self.GetIssue():
1728 if options.edit_description:
1729 change_desc.prompt()
1730 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1731 change_id = change_detail['change_id']
1732 change_desc.ensure_change_id(change_id)
1733
Joanna Wangb46232e2023-01-21 01:58:46 +00001734 else: # No change issue. First time uploading
1735 if not options.force and not options.message_file:
1736 change_desc.prompt()
1737
1738 # Check if user added a change_id in the descripiton.
1739 change_ids = git_footers.get_footer_change_id(change_desc.description)
1740 if len(change_ids) == 1:
1741 change_id = change_ids[0]
1742 else:
1743 change_id = GenerateGerritChangeId(change_desc.description)
1744 change_desc.ensure_change_id(change_id)
1745
1746 if options.preserve_tryjobs:
1747 change_desc.set_preserve_tryjobs()
1748
1749 SaveDescriptionBackup(change_desc)
1750
1751 # Add ccs
1752 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001753 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001754 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001755 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001756 ccs = self.GetCCList().split(',')
1757 if len(ccs) > 100:
1758 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1759 'process/lsc/lsc_workflow.md')
1760 print('WARNING: This will auto-CC %s users.' % len(ccs))
1761 print('LSC may be more appropriate: %s' % lsc)
1762 print('You can also use the --no-autocc flag to disable auto-CC.')
1763 confirm_or_exit(action='continue')
1764
1765 # Add ccs from the --cc flag.
1766 if options.cc:
1767 ccs.extend(options.cc)
1768
1769 ccs = [email.strip() for email in ccs if email.strip()]
1770 if change_desc.get_cced():
1771 ccs.extend(change_desc.get_cced())
1772
1773 return change_desc.get_reviewers(), ccs, change_desc
1774
Joanna Wang40497912023-01-24 21:18:16 +00001775 def PostUploadUpdates(self, options, new_upload, change_number):
1776 # type: (optparse.Values, _NewUpload, change_number) -> None
1777 """Makes necessary post upload changes to the local and remote cl."""
1778 if not self.GetIssue():
1779 self.SetIssue(change_number)
1780
Joanna Wang7603f042023-03-01 22:17:36 +00001781 self.SetPatchset(new_upload.prev_patchset + 1)
1782
Joanna Wang40497912023-01-24 21:18:16 +00001783 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1784 new_upload.commit_to_push)
1785 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1786 new_upload.new_last_uploaded_commit)
1787
1788 if settings.GetRunPostUploadHook():
1789 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001790 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00001791
1792 if new_upload.reviewers or new_upload.ccs:
1793 gerrit_util.AddReviewers(self.GetGerritHost(),
1794 self._GerritChangeIdentifier(),
1795 reviewers=new_upload.reviewers,
1796 ccs=new_upload.ccs,
1797 notify=bool(options.send_mail))
1798
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001799 def CMDUpload(self, options, git_diff_args, orig_args):
1800 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001801 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001802 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001803 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001804 else:
1805 if self.GetBranch() is None:
1806 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1807
1808 # Default to diffing against common ancestor of upstream branch
1809 base_branch = self.GetCommonAncestorWithUpstream()
1810 git_diff_args = [base_branch, 'HEAD']
1811
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001812 # Fast best-effort checks to abort before running potentially expensive
1813 # hooks if uploading is likely to fail anyway. Passing these checks does
1814 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001815 self.EnsureAuthenticated(force=options.force)
1816 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001817
1818 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001819 watchlist = watchlists.Watchlists(settings.GetRoot())
1820 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001821 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001822 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001823
Edward Lemur5a644f82020-03-18 16:44:57 +00001824 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001825 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001826 hook_results = self.RunHook(committing=False,
1827 may_prompt=not options.force,
1828 verbose=options.verbose,
1829 parallel=options.parallel,
1830 upstream=base_branch,
1831 description=change_desc.description,
1832 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001833 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001834
Aaron Gable13101a62018-02-09 13:20:41 -08001835 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001836 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001837 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001838 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001839 if self.GetBranch() is not None:
1840 self._GitSetBranchConfigValue(
1841 LAST_UPLOAD_HASH_CONFIG_KEY,
1842 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001843 # Run post upload hooks, if specified.
1844 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001845 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001846 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001847
1848 # Upload all dependencies if specified.
1849 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001850 print()
1851 print('--dependencies has been specified.')
1852 print('All dependent local branches will be re-uploaded.')
1853 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001854 # Remove the dependencies flag from args so that we do not end up in a
1855 # loop.
1856 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001857 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 return ret
1859
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001860 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001861 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001862
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001863 Issue must have been already uploaded and known.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001864 """
1865 assert new_state in _CQState.ALL_STATES
1866 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001867 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001868 vote_map = {
1869 _CQState.NONE: 0,
1870 _CQState.DRY_RUN: 1,
1871 _CQState.COMMIT: 2,
1872 }
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001873 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001874 notify = False if new_state == _CQState.DRY_RUN else None
1875 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001876 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001877 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001878 return 0
1879 except KeyboardInterrupt:
1880 raise
1881 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001882 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001883 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001884 ' * Your project has no CQ,\n'
1885 ' * You don\'t have permission to change the CQ state,\n'
1886 ' * There\'s a bug in this code (see stack trace below).\n'
1887 'Consider specifying which bots to trigger manually or asking your '
1888 'project owners for permissions or contacting Chrome Infra at:\n'
1889 'https://www.chromium.org/infra\n\n' %
1890 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001891 # Still raise exception so that stack trace is printed.
1892 raise
1893
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001894 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001895 # Lazy load of configs.
1896 self.GetCodereviewServer()
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001897
tandriie32e3ea2016-06-22 02:52:48 -07001898 if self._gerrit_host and '.' not in self._gerrit_host:
1899 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
Edward Lemur79d4f992019-11-11 23:49:02 +00001900 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001901 if parsed.scheme == 'sso':
tandriie32e3ea2016-06-22 02:52:48 -07001902 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1903 self._gerrit_server = 'https://%s' % self._gerrit_host
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001904
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905 return self._gerrit_host
1906
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001907 def _GetGitHost(self):
1908 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001909 remote_url = self.GetRemoteUrl()
1910 if not remote_url:
1911 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001912 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001913
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001914 def GetCodereviewServer(self):
1915 if not self._gerrit_server:
1916 # If we're on a branch then get the server potentially associated
1917 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001918 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001919 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001920 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001921 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001922 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923 if not self._gerrit_server:
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001924 url = urllib.parse.urlparse(self.GetRemoteUrl())
1925 parts = url.netloc.split('.')
1926
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001927 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1928 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929 parts[0] = parts[0] + '-review'
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001930
1931 if url.scheme == 'sso' and len(parts) == 1:
1932 # sso:// uses abbreivated hosts, eg. sso://chromium instead of
1933 # chromium.googlesource.com. Hence, for code review server, they need
1934 # to be expanded.
1935 parts[0] += '.googlesource.com'
1936
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 self._gerrit_host = '.'.join(parts)
1938 self._gerrit_server = 'https://%s' % self._gerrit_host
1939 return self._gerrit_server
1940
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001941 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001942 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001943 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001944 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001945 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001946 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001947 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001948 if project.endswith('.git'):
1949 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001950 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1951 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1952 # gitiles/git-over-https protocol. E.g.,
1953 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1954 # as
1955 # https://chromium.googlesource.com/v8/v8
1956 if project.startswith('a/'):
1957 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001958 return project
1959
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001960 def _GerritChangeIdentifier(self):
1961 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1962
1963 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001964 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001965 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001966 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001967 if project:
1968 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1969 # Fall back on still unique, but less efficient change number.
1970 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001971
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001972 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001973 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001974 if settings.GetGerritSkipEnsureAuthenticated():
1975 # For projects with unusual authentication schemes.
1976 # See http://crbug.com/603378.
1977 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001978
1979 # Check presence of cookies only if using cookies-based auth method.
1980 cookie_auth = gerrit_util.Authenticator.get()
1981 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001982 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001983
Florian Mayerae510e82020-01-30 21:04:48 +00001984 remote_url = self.GetRemoteUrl()
1985 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001986 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001987 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001988 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1989 logging.warning(
1990 'Ignoring branch %(branch)s with non-https/sso remote '
1991 '%(remote)s', {
1992 'branch': self.branch,
1993 'remote': self.GetRemoteUrl()
1994 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001995 return
1996
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001997 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001998 self.GetCodereviewServer()
1999 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002000 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002001
2002 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2003 git_auth = cookie_auth.get_auth_header(git_host)
2004 if gerrit_auth and git_auth:
2005 if gerrit_auth == git_auth:
2006 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002007 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002008 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002009 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002010 ' %s\n'
2011 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002012 ' Consider running the following command:\n'
2013 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002014 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002015 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002016 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002017 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002018 cookie_auth.get_new_password_message(git_host)))
2019 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002020 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002022
2023 missing = (
2024 ([] if gerrit_auth else [self._gerrit_host]) +
2025 ([] if git_auth else [git_host]))
2026 DieWithError('Credentials for the following hosts are required:\n'
2027 ' %s\n'
2028 'These are read from %s (or legacy %s)\n'
2029 '%s' % (
2030 '\n '.join(missing),
2031 cookie_auth.get_gitcookies_path(),
2032 cookie_auth.get_netrc_path(),
2033 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002034
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002035 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002036 if not self.GetIssue():
2037 return
2038
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002039 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002040 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002041 DieWithError(
2042 'Change %s has been abandoned, new uploads are not allowed' %
2043 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002044 if status == 'MERGED':
2045 answer = gclient_utils.AskForData(
2046 'Change %s has been submitted, new uploads are not allowed. '
2047 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2048 ).lower()
2049 if answer not in ('y', ''):
2050 DieWithError('New uploads are not allowed.')
2051 self.SetIssue()
2052 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002053
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002054 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2055 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2056 # Apparently this check is not very important? Otherwise get_auth_email
2057 # could have been added to other implementations of Authenticator.
2058 cookies_auth = gerrit_util.Authenticator.get()
2059 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002060 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002061
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002062 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002063 if self.GetIssueOwner() == cookies_user:
2064 return
2065 logging.debug('change %s owner is %s, cookies user is %s',
2066 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002067 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002068 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002069 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002070 if details['email'] == self.GetIssueOwner():
2071 return
2072 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002073 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002074 'as %s.\n'
2075 'Uploading may fail due to lack of permissions.' %
2076 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2077 confirm_or_exit(action='upload')
2078
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002079 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002080 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002081 or CQ status, assuming adherence to a common workflow.
2082
2083 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002084 * 'error' - error from review tool (including deleted issues)
2085 * 'unsent' - no reviewers added
2086 * 'waiting' - waiting for review
2087 * 'reply' - waiting for uploader to reply to review
2088 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002089 * 'dry-run' - dry-running in the CQ
2090 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002091 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002092 """
2093 if not self.GetIssue():
2094 return None
2095
2096 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002097 data = self._GetChangeDetail([
2098 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002099 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002100 return 'error'
2101
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002102 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002103 return 'closed'
2104
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002105 cq_label = data['labels'].get('Commit-Queue', {})
2106 max_cq_vote = 0
2107 for vote in cq_label.get('all', []):
2108 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2109 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002110 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002111 if max_cq_vote == 1:
2112 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002113
Aaron Gable9ab38c62017-04-06 14:36:33 -07002114 if data['labels'].get('Code-Review', {}).get('approved'):
2115 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002116
2117 if not data.get('reviewers', {}).get('REVIEWER', []):
2118 return 'unsent'
2119
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002120 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002121 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002122 while messages:
2123 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002124 if (m.get('tag', '').startswith('autogenerated:cq') or
2125 m.get('tag', '').startswith('autogenerated:cv')):
2126 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002127 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002128 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002129 # Most recent message was by owner.
2130 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002131
2132 # Some reply from non-owner.
2133 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002134
2135 # Somehow there are no messages even though there are reviewers.
2136 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002137
Gavin Mak4e5e3992022-11-14 22:40:12 +00002138 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002139 if not self.GetIssue():
2140 return None
2141
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002142 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002143 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002144 if update:
2145 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002146 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002147
Gavin Makf35a9eb2022-11-17 18:34:36 +00002148 def _IsPatchsetRangeSignificant(self, lower, upper):
2149 """Returns True if the inclusive range of patchsets contains any reworks or
2150 rebases."""
2151 if not self.GetIssue():
2152 return False
2153
2154 data = self._GetChangeDetail(['ALL_REVISIONS'])
2155 ps_kind = {}
2156 for rev_info in data.get('revisions', {}).values():
2157 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2158
2159 for ps in range(lower, upper + 1):
2160 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2161 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2162 return True
2163 return False
2164
Gavin Make61ccc52020-11-13 00:12:57 +00002165 def GetMostRecentDryRunPatchset(self):
2166 """Get patchsets equivalent to the most recent patchset and return
2167 the patchset with the latest dry run. If none have been dry run, return
2168 the latest patchset."""
2169 if not self.GetIssue():
2170 return None
2171
2172 data = self._GetChangeDetail(['ALL_REVISIONS'])
2173 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002174 dry_run = {int(m['_revision_number'])
2175 for m in data.get('messages', [])
2176 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002177
2178 for revision_info in sorted(data.get('revisions', {}).values(),
2179 key=lambda c: c['_number'], reverse=True):
2180 if revision_info['_number'] in dry_run:
2181 patchset = revision_info['_number']
2182 break
2183 if revision_info.get('kind', '') not in \
2184 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2185 break
2186 self.SetPatchset(patchset)
2187 return patchset
2188
Aaron Gable636b13f2017-07-14 10:42:48 -07002189 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002190 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002191 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002192 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002193
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002194 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002195 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002196 # CURRENT_REVISION is included to get the latest patchset so that
2197 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002198 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002199 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2200 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002201 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002202 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002203 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002204 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002205
2206 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002207 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002208 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002209 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002210 line_comments = file_comments.setdefault(path, [])
2211 line_comments.extend(
2212 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002213
2214 # Build dictionary of file comments for easy access and sorting later.
2215 # {author+date: {path: {patchset: {line: url+message}}}}
2216 comments = collections.defaultdict(
2217 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002218
2219 server = self.GetCodereviewServer()
2220 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2221 # /c/ is automatically added by short URL server.
2222 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2223 self.GetIssue())
2224 else:
2225 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2226
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002227 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002228 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002229 tag = comment.get('tag', '')
2230 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002231 continue
2232 key = (comment['author']['email'], comment['updated'])
2233 if comment.get('side', 'REVISION') == 'PARENT':
2234 patchset = 'Base'
2235 else:
2236 patchset = 'PS%d' % comment['patch_set']
2237 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002238 url = ('%s/%s/%s#%s%s' %
2239 (url_prefix, comment['patch_set'], path,
2240 'b' if comment.get('side') == 'PARENT' else '',
2241 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002242 comments[key][path][patchset][line] = (url, comment['message'])
2243
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002245 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002246 summary = self._BuildCommentSummary(msg, comments, readable)
2247 if summary:
2248 summaries.append(summary)
2249 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002250
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002251 @staticmethod
2252 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002253 if 'email' not in msg['author']:
2254 # Some bot accounts may not have an email associated.
2255 return None
2256
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002257 key = (msg['author']['email'], msg['date'])
2258 # Don't bother showing autogenerated messages that don't have associated
2259 # file or line comments. this will filter out most autogenerated
2260 # messages, but will keep robot comments like those from Tricium.
2261 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2262 if is_autogenerated and not comments.get(key):
2263 return None
2264 message = msg['message']
2265 # Gerrit spits out nanoseconds.
2266 assert len(msg['date'].split('.')[-1]) == 9
2267 date = datetime.datetime.strptime(msg['date'][:-3],
2268 '%Y-%m-%d %H:%M:%S.%f')
2269 if key in comments:
2270 message += '\n'
2271 for path, patchsets in sorted(comments.get(key, {}).items()):
2272 if readable:
2273 message += '\n%s' % path
2274 for patchset, lines in sorted(patchsets.items()):
2275 for line, (url, content) in sorted(lines.items()):
2276 if line:
2277 line_str = 'Line %d' % line
2278 path_str = '%s:%d:' % (path, line)
2279 else:
2280 line_str = 'File comment'
2281 path_str = '%s:0:' % path
2282 if readable:
2283 message += '\n %s, %s: %s' % (patchset, line_str, url)
2284 message += '\n %s\n' % content
2285 else:
2286 message += '\n%s ' % path_str
2287 message += '\n%s\n' % content
2288
2289 return _CommentSummary(
2290 date=date,
2291 message=message,
2292 sender=msg['author']['email'],
2293 autogenerated=is_autogenerated,
2294 # These could be inferred from the text messages and correlated with
2295 # Code-Review label maximum, however this is not reliable.
2296 # Leaving as is until the need arises.
2297 approval=False,
2298 disapproval=False,
2299 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002300
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002301 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002302 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002303 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002304
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002305 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002306 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002307 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002308
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002309 def _GetChangeDetail(self, options=None):
2310 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002311 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002312 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002313
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002314 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002315 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002316 options.append('CURRENT_COMMIT')
2317
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002318 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002319 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002320 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002321
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002322 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2323 # Assumption: data fetched before with extra options is suitable
2324 # for return for a smaller set of options.
2325 # For example, if we cached data for
2326 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2327 # and request is for options=[CURRENT_REVISION],
2328 # THEN we can return prior cached data.
2329 if options_set.issubset(cached_options_set):
2330 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002331
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002332 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002333 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002334 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002335 except gerrit_util.GerritError as e:
2336 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002337 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002338 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002339
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002340 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002341 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002342
Gavin Mak4e5e3992022-11-14 22:40:12 +00002343 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002344 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002345 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002346 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2347 self._GerritChangeIdentifier(),
2348 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002349 except gerrit_util.GerritError as e:
2350 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002351 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002352 raise
agable32978d92016-11-01 12:55:02 -07002353 return data
2354
Karen Qian40c19422019-03-13 21:28:29 +00002355 def _IsCqConfigured(self):
2356 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002357 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002358
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002359 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002360 if git_common.is_dirty_git_tree('land'):
2361 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002362
tandriid60367b2016-06-22 05:25:12 -07002363 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002364 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002365 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002366 'which can test and land changes for you. '
2367 'Are you sure you wish to bypass it?\n',
2368 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002369 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002370 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002371 # Note: git diff outputs nothing if there is no diff.
2372 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002373 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002374 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002375 if detail['current_revision'] == last_upload:
2376 differs = False
2377 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002378 print('WARNING: Local branch contents differ from latest uploaded '
2379 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002380 if differs:
2381 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002382 confirm_or_exit(
2383 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2384 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002385 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002386 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002387 upstream = self.GetCommonAncestorWithUpstream()
2388 if self.GetIssue():
2389 description = self.FetchDescription()
2390 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002391 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002392 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002393 committing=True,
2394 may_prompt=not force,
2395 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002396 parallel=parallel,
2397 upstream=upstream,
2398 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002399 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002400 resultdb=resultdb,
2401 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002402
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002403 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002404 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002405 links = self._GetChangeCommit().get('web_links', [])
2406 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002407 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002408 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002409 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002410 return 0
2411
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002412 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2413 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002414 assert parsed_issue_arg.valid
2415
Edward Lemur125d60a2019-09-13 18:25:41 +00002416 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002417
2418 if parsed_issue_arg.hostname:
2419 self._gerrit_host = parsed_issue_arg.hostname
2420 self._gerrit_server = 'https://%s' % self._gerrit_host
2421
tandriic2405f52016-10-10 08:13:15 -07002422 try:
2423 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002424 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002425 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002426
2427 if not parsed_issue_arg.patchset:
2428 # Use current revision by default.
2429 revision_info = detail['revisions'][detail['current_revision']]
2430 patchset = int(revision_info['_number'])
2431 else:
2432 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002433 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002434 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2435 break
2436 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002437 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002438 (parsed_issue_arg.patchset, self.GetIssue()))
2439
Edward Lemur125d60a2019-09-13 18:25:41 +00002440 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002441 if remote_url.endswith('.git'):
2442 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002443 remote_url = remote_url.rstrip('/')
2444
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002445 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002446 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002447
2448 if remote_url != fetch_info['url']:
2449 DieWithError('Trying to patch a change from %s but this repo appears '
2450 'to be %s.' % (fetch_info['url'], remote_url))
2451
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002452 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002453
Joanna Wangc023a632023-01-26 17:59:25 +00002454 # Set issue immediately in case the cherry-pick fails, which happens
2455 # when resolving conflicts.
2456 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002457 self.SetIssue(parsed_issue_arg.issue)
2458
Aaron Gable62619a32017-06-16 08:22:09 -07002459 if force:
2460 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2461 print('Checked out commit for change %i patchset %i locally' %
2462 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002463 elif nocommit:
2464 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2465 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002466 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002467 RunGit(['cherry-pick', 'FETCH_HEAD'])
2468 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002469 (parsed_issue_arg.issue, patchset))
2470 print('Note: this created a local commit which does not have '
2471 'the same hash as the one uploaded for review. This will make '
2472 'uploading changes based on top of this branch difficult.\n'
2473 'If you want to do that, use "git cl patch --force" instead.')
2474
Stefan Zagerd08043c2017-10-12 12:07:02 -07002475 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002476 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002477 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002478 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2479 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002480 else:
2481 print('WARNING: You are in detached HEAD state.\n'
2482 'The patch has been applied to your checkout, but you will not be '
2483 'able to upload a new patch set to the gerrit issue.\n'
2484 'Try using the \'-b\' option if you would like to work on a '
2485 'branch and/or upload a new patch set.')
2486
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002487 return 0
2488
Joanna Wang18de1f62023-01-21 01:24:24 +00002489 @staticmethod
2490 def _GerritCommitMsgHookCheck(offer_removal):
2491 # type: (bool) -> None
2492 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002493 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2494 if not os.path.exists(hook):
2495 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002496 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2497 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002498 data = gclient_utils.FileRead(hook)
2499 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2500 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002501 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002502 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002503 'and may interfere with it in subtle ways.\n'
2504 'We recommend you remove the commit-msg hook.')
2505 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002506 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002507 gclient_utils.rm_file_or_tree(hook)
2508 print('Gerrit commit-msg hook removed.')
2509 else:
2510 print('OK, will keep Gerrit commit-msg hook in place.')
2511
Edward Lemur1b52d872019-05-09 21:12:12 +00002512 def _CleanUpOldTraces(self):
2513 """Keep only the last |MAX_TRACES| traces."""
2514 try:
2515 traces = sorted([
2516 os.path.join(TRACES_DIR, f)
2517 for f in os.listdir(TRACES_DIR)
2518 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2519 and not f.startswith('tmp'))
2520 ])
2521 traces_to_delete = traces[:-MAX_TRACES]
2522 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002523 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002524 except OSError:
2525 print('WARNING: Failed to remove old git traces from\n'
2526 ' %s'
2527 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002528
Edward Lemur5737f022019-05-17 01:24:00 +00002529 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002530 """Zip and write the git push traces stored in traces_dir."""
2531 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002532 traces_zip = trace_name + '-traces'
2533 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002534 # Create a temporary dir to store git config and gitcookies in. It will be
2535 # compressed and stored next to the traces.
2536 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002537 git_info_zip = trace_name + '-git-info'
2538
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002539 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002540
Edward Lemur1b52d872019-05-09 21:12:12 +00002541 git_push_metadata['trace_name'] = trace_name
2542 gclient_utils.FileWrite(
2543 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2544
2545 # Keep only the first 6 characters of the git hashes on the packet
2546 # trace. This greatly decreases size after compression.
2547 packet_traces = os.path.join(traces_dir, 'trace-packet')
2548 if os.path.isfile(packet_traces):
2549 contents = gclient_utils.FileRead(packet_traces)
2550 gclient_utils.FileWrite(
2551 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2552 shutil.make_archive(traces_zip, 'zip', traces_dir)
2553
2554 # Collect and compress the git config and gitcookies.
2555 git_config = RunGit(['config', '-l'])
2556 gclient_utils.FileWrite(
2557 os.path.join(git_info_dir, 'git-config'),
2558 git_config)
2559
2560 cookie_auth = gerrit_util.Authenticator.get()
2561 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2562 gitcookies_path = cookie_auth.get_gitcookies_path()
2563 if os.path.isfile(gitcookies_path):
2564 gitcookies = gclient_utils.FileRead(gitcookies_path)
2565 gclient_utils.FileWrite(
2566 os.path.join(git_info_dir, 'gitcookies'),
2567 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2568 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2569
Edward Lemur1b52d872019-05-09 21:12:12 +00002570 gclient_utils.rmtree(git_info_dir)
2571
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002572 def _RunGitPushWithTraces(self,
2573 refspec,
2574 refspec_opts,
2575 git_push_metadata,
2576 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002577 """Run git push and collect the traces resulting from the execution."""
2578 # Create a temporary directory to store traces in. Traces will be compressed
2579 # and stored in a 'traces' dir inside depot_tools.
2580 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002581 trace_name = os.path.join(
2582 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002583
2584 env = os.environ.copy()
2585 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2586 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002587 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002588 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2589 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2590 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2591
2592 try:
2593 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002594 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002595 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002596 push_cmd = ['git', 'push', remote_url, refspec]
2597 if git_push_options:
2598 for opt in git_push_options:
2599 push_cmd.extend(['-o', opt])
2600
Edward Lemur0f58ae42019-04-30 17:24:12 +00002601 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002602 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002603 env=env,
2604 print_stdout=True,
2605 # Flush after every line: useful for seeing progress when running as
2606 # recipe.
2607 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002608 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002609 except subprocess2.CalledProcessError as e:
2610 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002611 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002612 raise GitPushError(
2613 'Failed to create a change, very likely due to blocked keyword. '
2614 'Please examine output above for the reason of the failure.\n'
2615 'If this is a false positive, you can try to bypass blocked '
2616 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002617 '-o banned-words~skip, e.g.:\n'
2618 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002619 'If git-cl is not working correctly, file a bug under the '
2620 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002621 if 'git push -o nokeycheck' in str(e.stdout):
2622 raise GitPushError(
2623 'Failed to create a change, very likely due to a private key being '
2624 'detected. Please examine output above for the reason of the '
2625 'failure.\n'
2626 'If this is a false positive, you can try to bypass private key '
2627 'detection by using push option '
2628 '-o nokeycheck, e.g.:\n'
2629 'git cl upload -o nokeycheck\n\n'
2630 'If git-cl is not working correctly, file a bug under the '
2631 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002632
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002633 raise GitPushError(
2634 'Failed to create a change. Please examine output above for the '
2635 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002636 'For emergencies, Googlers can escalate to '
2637 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002638 'Hint: run command below to diagnose common Git/Gerrit '
2639 'credential problems:\n'
2640 ' git cl creds-check\n'
2641 '\n'
2642 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2643 'component including the files below.\n'
2644 'Review the files before upload, since they might contain sensitive '
2645 'information.\n'
2646 'Set the Restrict-View-Google label so that they are not publicly '
2647 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002648 finally:
2649 execution_time = time_time() - before_push
2650 metrics.collector.add_repeated('sub_commands', {
2651 'command': 'git push',
2652 'execution_time': execution_time,
2653 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002654 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002655 })
2656
Edward Lemur1b52d872019-05-09 21:12:12 +00002657 git_push_metadata['execution_time'] = execution_time
2658 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002659 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002660
Edward Lemur1b52d872019-05-09 21:12:12 +00002661 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002662 gclient_utils.rmtree(traces_dir)
2663
2664 return push_stdout
2665
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002666 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2667 change_desc):
2668 """Upload the current branch to Gerrit, retry if new remote HEAD is
2669 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002670 remote, remote_branch = self.GetRemoteBranch()
2671 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2672
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002673 try:
2674 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002675 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002676 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002677 # Repository might be in the middle of transition to main branch as
2678 # default, and uploads to old default might be blocked.
2679 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002680 DieWithError(str(e), change_desc)
2681
Josip Sokcevicb631a882021-01-06 18:18:10 +00002682 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2683 self.GetGerritProject())
2684 if project_head == branch:
2685 DieWithError(str(e), change_desc)
2686 branch = project_head
2687
2688 print("WARNING: Fetching remote state and retrying upload to default "
2689 "branch...")
2690 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002691 options.edit_description = False
2692 options.force = True
2693 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002694 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2695 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002696 except GitPushError as e:
2697 DieWithError(str(e), change_desc)
2698
2699 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002700 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002701 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002702 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002703 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002704 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002705 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002706 # User requested to change description
2707 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002708 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002709 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2710 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002711 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002712
2713 # Check if changes outside of this workspace have been uploaded.
2714 current_rev = change_detail['current_revision']
2715 last_uploaded_rev = self._GitGetBranchConfigValue(
2716 GERRIT_SQUASH_HASH_CONFIG_KEY)
2717 if last_uploaded_rev and current_rev != last_uploaded_rev:
2718 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002719 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002720 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002721 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002722 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002723 if len(change_ids) == 1:
2724 change_id = change_ids[0]
2725 else:
2726 change_id = GenerateGerritChangeId(change_desc.description)
2727 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002728
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002729 if options.preserve_tryjobs:
2730 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002731
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002732 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002733 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002734 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002736 with gclient_utils.temporary_file() as desc_tempfile:
2737 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2738 ref_to_push = RunGit(
2739 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002740 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002741 if options.no_add_changeid:
2742 pass
2743 else: # adding Change-Ids is okay.
2744 if not git_footers.get_footer_change_id(change_desc.description):
2745 DownloadGerritHook(False)
2746 change_desc.set_description(
2747 self._AddChangeIdToCommitMessage(change_desc.description,
2748 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002749 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002750 # For no-squash mode, we assume the remote called "origin" is the one we
2751 # want. It is not worthwhile to support different workflows for
2752 # no-squash mode.
2753 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002754 # attempt to extract the changeid from the current description
2755 # fail informatively if not possible.
2756 change_id_candidates = git_footers.get_footer_change_id(
2757 change_desc.description)
2758 if not change_id_candidates:
2759 DieWithError("Unable to extract change-id from message.")
2760 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002762 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2764 ref_to_push)]).splitlines()
2765 if len(commits) > 1:
2766 print('WARNING: This will upload %d commits. Run the following command '
2767 'to see which commits will be uploaded: ' % len(commits))
2768 print('git log %s..%s' % (parent, ref_to_push))
2769 print('You can also use `git squash-branch` to squash these into a '
2770 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002771 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002772
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002773 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002774 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002775 # Add default, watchlist, presubmit ccs if this is the initial upload
2776 # and CL is not private and auto-ccing has not been disabled.
2777 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002778 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002779 if len(cc) > 100:
2780 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2781 'process/lsc/lsc_workflow.md')
2782 print('WARNING: This will auto-CC %s users.' % len(cc))
2783 print('LSC may be more appropriate: %s' % lsc)
2784 print('You can also use the --no-autocc flag to disable auto-CC.')
2785 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002786 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002787 if options.cc:
2788 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002789 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002790 if change_desc.get_cced():
2791 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002792 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002793 valid_accounts = set(reviewers + cc)
2794 # TODO(crbug/877717): relax this for all hosts.
2795 else:
2796 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002797 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002798 logging.info('accounts %s are recognized, %s invalid',
2799 sorted(valid_accounts),
2800 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002801
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002802 # Extra options that can be specified at push time. Doc:
2803 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002804 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002805
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002806 for r in sorted(reviewers):
2807 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002808 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002809 reviewers.remove(r)
2810 else:
2811 # TODO(tandrii): this should probably be a hard failure.
2812 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2813 % r)
2814 for c in sorted(cc):
2815 # refspec option will be rejected if cc doesn't correspond to an
2816 # account, even though REST call to add such arbitrary cc may succeed.
2817 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002818 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002819 cc.remove(c)
2820
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002821 refspec_suffix = ''
2822 if refspec_opts:
2823 refspec_suffix = '%' + ','.join(refspec_opts)
2824 assert ' ' not in refspec_suffix, (
2825 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2826 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002827
Edward Lemur1b52d872019-05-09 21:12:12 +00002828 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002829 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002830 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002831 'change_id': change_id,
2832 'description': change_desc.description,
2833 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002834
Gavin Mak4e5e3992022-11-14 22:40:12 +00002835 # Gerrit may or may not update fast enough to return the correct patchset
2836 # number after we push. Get the pre-upload patchset and increment later.
2837 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2838
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002839 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002840 git_push_metadata,
2841 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002842
2843 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002844 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002845 change_numbers = [m.group(1)
2846 for m in map(regex.match, push_stdout.splitlines())
2847 if m]
2848 if len(change_numbers) != 1:
2849 DieWithError(
2850 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002851 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002852 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002853 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002854 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002855
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002856 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002857 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002858 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002859 gerrit_util.AddReviewers(self.GetGerritHost(),
2860 self._GerritChangeIdentifier(),
2861 reviewers,
2862 cc,
2863 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002864
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002865 return 0
2866
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002867 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2868 change_desc):
2869 """Computes parent of the generated commit to be uploaded to Gerrit.
2870
2871 Returns revision or a ref name.
2872 """
2873 if custom_cl_base:
2874 # Try to avoid creating additional unintended CLs when uploading, unless
2875 # user wants to take this risk.
2876 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2877 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2878 local_ref_of_target_remote])
2879 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002880 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002881 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2882 'If you proceed with upload, more than 1 CL may be created by '
2883 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2884 'If you are certain that specified base `%s` has already been '
2885 'uploaded to Gerrit as another CL, you may proceed.\n' %
2886 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2887 if not force:
2888 confirm_or_exit(
2889 'Do you take responsibility for cleaning up potential mess '
2890 'resulting from proceeding with upload?',
2891 action='upload')
2892 return custom_cl_base
2893
Aaron Gablef97e33d2017-03-30 15:44:27 -07002894 if remote != '.':
2895 return self.GetCommonAncestorWithUpstream()
2896
2897 # If our upstream branch is local, we base our squashed commit on its
2898 # squashed version.
2899 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2900
Aaron Gablef97e33d2017-03-30 15:44:27 -07002901 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002902 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002903 if upstream_branch_name == 'main':
2904 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002905
2906 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002907 # TODO(tandrii): consider checking parent change in Gerrit and using its
2908 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2909 # the tree hash of the parent branch. The upside is less likely bogus
2910 # requests to reupload parent change just because it's uploadhash is
2911 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002912 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2913 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002914 # Verify that the upstream branch has been uploaded too, otherwise
2915 # Gerrit will create additional CLs when uploading.
2916 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2917 RunGitSilent(['rev-parse', parent + ':'])):
2918 DieWithError(
2919 '\nUpload upstream branch %s first.\n'
2920 'It is likely that this branch has been rebased since its last '
2921 'upload, so you just need to upload it again.\n'
2922 '(If you uploaded it with --no-squash, then branch dependencies '
2923 'are not supported, and you should reupload with --squash.)'
2924 % upstream_branch_name,
2925 change_desc)
2926 return parent
2927
Gavin Mak4e5e3992022-11-14 22:40:12 +00002928 def _UpdateWithExternalChanges(self):
2929 """Updates workspace with external changes.
2930
2931 Returns the commit hash that should be used as the merge base on upload.
2932 """
2933 local_ps = self.GetPatchset()
2934 if local_ps is None:
2935 return
2936
2937 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002938 if external_ps is None or local_ps == external_ps or \
2939 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002940 return
2941
2942 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002943 if num_changes > 1:
2944 change_words = 'changes were'
2945 else:
2946 change_words = 'change was'
2947 print('\n%d external %s published to %s:\n' %
2948 (num_changes, change_words, self.GetIssueURL(short=True)))
2949
2950 # Print an overview of external changes.
2951 ps_to_commit = {}
2952 ps_to_info = {}
2953 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2954 for commit_id, revision_info in revisions.get('revisions', {}).items():
2955 ps_num = revision_info['_number']
2956 ps_to_commit[ps_num] = commit_id
2957 ps_to_info[ps_num] = revision_info
2958
2959 for ps in range(external_ps, local_ps, -1):
2960 commit = ps_to_commit[ps][:8]
2961 desc = ps_to_info[ps].get('description', '')
2962 print('Patchset %d [%s] %s' % (ps, commit, desc))
2963
Josip Sokcevic43ceaf02023-05-25 15:56:00 +00002964 print('\nSee diff at: %s/%d..%d' %
2965 (self.GetIssueURL(short=True), local_ps, external_ps))
2966 print('\nUploading without applying patches will override them.')
2967
2968 if not ask_for_explicit_yes('Get the latest changes and apply on top?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002969 return
2970
2971 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2972 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2973 external_base = external_parent['commit']
2974
2975 branch = git_common.current_branch()
2976 local_base = self.GetCommonAncestorWithUpstream()
2977 if local_base != external_base:
2978 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2979 (local_base, external_base))
2980 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00002981 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2982 'Continue with upload and override the latest changes?')
2983 return
2984 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00002985
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00002986 external_parent_last_uploaded = self._GetChangeCommit(
2987 revision=local_ps)['parents'][0]
2988 external_base_last_uploaded = external_parent_last_uploaded['commit']
2989
2990 if external_base != external_base_last_uploaded:
2991 print('\nPatch set merge bases are different (%s, %s).\n' %
2992 (external_base_last_uploaded, external_base))
2993 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2994 'Continue with upload and override the latest changes?')
2995 return
2996
Gavin Mak4e5e3992022-11-14 22:40:12 +00002997 # Fetch Gerrit's CL base if it doesn't exist locally.
2998 remote, _ = self.GetRemoteBranch()
2999 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3000 RunGitSilent(['fetch', remote, external_base])
3001
3002 # Get the diff between local_ps and external_ps.
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003003 print('Fetching changes...')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003004 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003005 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003006 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3007 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3008 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3009 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003010
3011 # If the commit parents are different, don't apply the diff as it very
3012 # likely contains many more changes not relevant to this CL.
3013 parents = RunGitSilent(
3014 ['rev-parse',
3015 '%s~1' % (last_uploaded),
3016 '%s~1' % (latest_external)]).strip().split()
3017 assert len(parents) == 2, 'Expected two parents.'
3018 if parents[0] != parents[1]:
3019 confirm_or_exit(
3020 'Can\'t apply the latest changes from Gerrit (parent mismatch '
3021 'between PS).\n'
3022 'Continue with upload and override the latest changes?')
3023 return
3024
Gavin Mak4e5e3992022-11-14 22:40:12 +00003025 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3026
3027 # Diff can be empty in the case of trivial rebases.
3028 if not diff:
3029 return external_base
3030
3031 # Apply the diff.
3032 with gclient_utils.temporary_file() as diff_tempfile:
3033 gclient_utils.FileWrite(diff_tempfile, diff)
3034 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3035 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3036 if not clean_patch:
3037 # Normally patchset is set after upload. But because we exit, that never
3038 # happens. Updating here makes sure that subsequent uploads don't need
3039 # to fetch/apply the same diff again.
3040 self.SetPatchset(external_ps)
3041 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3042 'conflicts and reupload.')
3043
3044 message = 'Incorporate external changes from '
3045 if num_changes == 1:
3046 message += 'patchset %d' % external_ps
3047 else:
3048 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3049 RunGitSilent(['commit', '-am', message])
3050 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3051 # patchset title instead of this 'Incorporate' message.
3052 return external_base
3053
Edward Lemura12175c2020-03-09 16:58:26 +00003054 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003055 """Re-commits using the current message, assumes the commit hook is in
3056 place.
3057 """
Edward Lemura12175c2020-03-09 16:58:26 +00003058 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003059 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003060 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003061 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003062 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003063
3064 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003065
tandriie113dfd2016-10-11 10:20:12 -07003066 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003067 try:
3068 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003069 except GerritChangeNotExists:
3070 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003071
3072 if data['status'] in ('ABANDONED', 'MERGED'):
3073 return 'CL %s is closed' % self.GetIssue()
3074
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003075 def GetGerritChange(self, patchset=None):
3076 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003077 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003078 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003079 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003080 data = self._GetChangeDetail(['ALL_REVISIONS'])
3081
3082 assert host and issue and patchset, 'CL must be uploaded first'
3083
3084 has_patchset = any(
3085 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003086 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003087 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003088 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003089 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003090
tandrii8c5a3532016-11-04 07:52:02 -07003091 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003092 'host': host,
3093 'change': issue,
3094 'project': data['project'],
3095 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003096 }
tandriie113dfd2016-10-11 10:20:12 -07003097
tandriide281ae2016-10-12 06:02:30 -07003098 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003099 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003100
Edward Lemur707d70b2018-02-07 00:50:14 +01003101 def GetReviewers(self):
3102 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003103 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003104
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003105
Lei Zhang8a0efc12020-08-05 19:58:45 +00003106def _get_bug_line_values(default_project_prefix, bugs):
3107 """Given default_project_prefix and comma separated list of bugs, yields bug
3108 line values.
tandriif9aefb72016-07-01 09:06:51 -07003109
3110 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003111 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003112 * string, which is left as is.
3113
3114 This function may produce more than one line, because bugdroid expects one
3115 project per line.
3116
Lei Zhang8a0efc12020-08-05 19:58:45 +00003117 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003118 ['v8:123', 'chromium:789']
3119 """
3120 default_bugs = []
3121 others = []
3122 for bug in bugs.split(','):
3123 bug = bug.strip()
3124 if bug:
3125 try:
3126 default_bugs.append(int(bug))
3127 except ValueError:
3128 others.append(bug)
3129
3130 if default_bugs:
3131 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003132 if default_project_prefix:
3133 if not default_project_prefix.endswith(':'):
3134 default_project_prefix += ':'
3135 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003136 else:
3137 yield default_bugs
3138 for other in sorted(others):
3139 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3140 yield other
3141
3142
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003143class ChangeDescription(object):
3144 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003145 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003146 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003147 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003148 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003149 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003150 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3151 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003152 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003153 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003154
Dan Beamd8b04ca2019-10-10 21:23:26 +00003155 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003156 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003157 if bug:
3158 regexp = re.compile(self.BUG_LINE)
3159 prefix = settings.GetBugPrefix()
3160 if not any((regexp.match(line) for line in self._description_lines)):
3161 values = list(_get_bug_line_values(prefix, bug))
3162 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003163 if fixed:
3164 regexp = re.compile(self.FIXED_LINE)
3165 prefix = settings.GetBugPrefix()
3166 if not any((regexp.match(line) for line in self._description_lines)):
3167 values = list(_get_bug_line_values(prefix, fixed))
3168 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003169
agable@chromium.org42c20792013-09-12 17:34:49 +00003170 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003171 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003172 return '\n'.join(self._description_lines)
3173
3174 def set_description(self, desc):
Gavin Makcc976552023-08-28 17:01:52 +00003175 if isinstance(desc, str):
agable@chromium.org42c20792013-09-12 17:34:49 +00003176 lines = desc.splitlines()
3177 else:
3178 lines = [line.rstrip() for line in desc]
3179 while lines and not lines[0]:
3180 lines.pop(0)
3181 while lines and not lines[-1]:
3182 lines.pop(-1)
3183 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003184
Edward Lemur5a644f82020-03-18 16:44:57 +00003185 def ensure_change_id(self, change_id):
3186 description = self.description
3187 footer_change_ids = git_footers.get_footer_change_id(description)
3188 # Make sure that the Change-Id in the description matches the given one.
3189 if footer_change_ids != [change_id]:
3190 if footer_change_ids:
3191 # Remove any existing Change-Id footers since they don't match the
3192 # expected change_id footer.
3193 description = git_footers.remove_footer(description, 'Change-Id')
3194 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3195 'if you want to set a new one.')
3196 # Add the expected Change-Id footer.
3197 description = git_footers.add_footer_change_id(description, change_id)
3198 self.set_description(description)
3199
Joanna Wang39811b12023-01-20 23:09:48 +00003200 def update_reviewers(self, reviewers):
3201 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003202
3203 Args:
3204 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003205 """
Joanna Wang39811b12023-01-20 23:09:48 +00003206 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003207 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003208
3209 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003210
Joanna Wang39811b12023-01-20 23:09:48 +00003211 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003212 regexp = re.compile(self.R_LINE)
3213 matches = [regexp.match(line) for line in self._description_lines]
3214 new_desc = [l for i, l in enumerate(self._description_lines)
3215 if not matches[i]]
3216 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003217
Joanna Wang39811b12023-01-20 23:09:48 +00003218 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003219
Joanna Wang39811b12023-01-20 23:09:48 +00003220 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003221 for match in matches:
3222 if not match:
3223 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003224 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003225
Joanna Wang39811b12023-01-20 23:09:48 +00003226 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003227
3228 # Put the new lines in the description where the old first R= line was.
3229 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3230 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003231 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003233 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003235 def set_preserve_tryjobs(self):
3236 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3237 footers = git_footers.parse_footers(self.description)
3238 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3239 if v.lower() == 'true':
3240 return
3241 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3242
Anthony Polito8b955342019-09-24 19:01:36 +00003243 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 self.set_description([
3246 '# Enter a description of the change.',
3247 '# This will be displayed on the codereview site.',
3248 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003249 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003250 '--------------------',
3251 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003252 bug_regexp = re.compile(self.BUG_LINE)
3253 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003254 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003255 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003256
Dan Beamd8b04ca2019-10-10 21:23:26 +00003257 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003258 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003259
Bruce Dawsonfc487042020-10-27 19:11:37 +00003260 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003261 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003262 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003263 if not content:
3264 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003265 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003266
Bruce Dawson2377b012018-01-11 16:46:49 -08003267 # Strip off comments and default inserted "Bug:" line.
3268 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003269 (line.startswith('#') or
3270 line.rstrip() == "Bug:" or
3271 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003272 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003273 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003274 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003275
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003276 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003277 """Adds a footer line to the description.
3278
3279 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3280 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3281 that Gerrit footers are always at the end.
3282 """
3283 parsed_footer_line = git_footers.parse_footer(line)
3284 if parsed_footer_line:
3285 # Line is a gerrit footer in the form: Footer-Key: any value.
3286 # Thus, must be appended observing Gerrit footer rules.
3287 self.set_description(
3288 git_footers.add_footer(self.description,
3289 key=parsed_footer_line[0],
3290 value=parsed_footer_line[1]))
3291 return
3292
3293 if not self._description_lines:
3294 self._description_lines.append(line)
3295 return
3296
3297 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3298 if gerrit_footers:
3299 # git_footers.split_footers ensures that there is an empty line before
3300 # actual (gerrit) footers, if any. We have to keep it that way.
3301 assert top_lines and top_lines[-1] == ''
3302 top_lines, separator = top_lines[:-1], top_lines[-1:]
3303 else:
3304 separator = [] # No need for separator if there are no gerrit_footers.
3305
3306 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003307 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3308 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003309 top_lines.append('')
3310 top_lines.append(line)
3311 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003312
tandrii99a72f22016-08-17 14:33:24 -07003313 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003314 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003315 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003316 reviewers = [match.group(2).strip()
3317 for match in matches
3318 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003319 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003320
bradnelsond975b302016-10-23 12:20:23 -07003321 def get_cced(self):
3322 """Retrieves the list of reviewers."""
3323 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3324 cced = [match.group(2).strip() for match in matches if match]
3325 return cleanup_list(cced)
3326
Nodir Turakulov23b82142017-11-16 11:04:25 -08003327 def get_hash_tags(self):
3328 """Extracts and sanitizes a list of Gerrit hashtags."""
3329 subject = (self._description_lines or ('',))[0]
3330 subject = re.sub(
3331 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3332
3333 tags = []
3334 start = 0
3335 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3336 while True:
3337 m = bracket_exp.match(subject, start)
3338 if not m:
3339 break
3340 tags.append(self.sanitize_hash_tag(m.group(1)))
3341 start = m.end()
3342
3343 if not tags:
3344 # Try "Tag: " prefix.
3345 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3346 if m:
3347 tags.append(self.sanitize_hash_tag(m.group(1)))
3348 return tags
3349
3350 @classmethod
3351 def sanitize_hash_tag(cls, tag):
3352 """Returns a sanitized Gerrit hash tag.
3353
3354 A sanitized hashtag can be used as a git push refspec parameter value.
3355 """
3356 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3357
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003358
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003359def FindCodereviewSettingsFile(filename='codereview.settings'):
3360 """Finds the given file starting in the cwd and going up.
3361
3362 Only looks up to the top of the repository unless an
3363 'inherit-review-settings-ok' file exists in the root of the repository.
3364 """
3365 inherit_ok_file = 'inherit-review-settings-ok'
3366 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003367 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003368 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003369 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003370 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003371 if os.path.isfile(os.path.join(cwd, filename)):
3372 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003373 if cwd == root:
3374 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003375 parent_dir = os.path.dirname(cwd)
3376 if parent_dir == cwd:
3377 # We hit the system root directory.
3378 break
3379 cwd = parent_dir
3380 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003381
3382
3383def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003384 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003385 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003386
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003387 def SetProperty(name, setting, unset_error_ok=False):
3388 fullname = 'rietveld.' + name
3389 if setting in keyvals:
3390 RunGit(['config', fullname, keyvals[setting]])
3391 else:
3392 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3393
tandrii48df5812016-10-17 03:55:37 -07003394 if not keyvals.get('GERRIT_HOST', False):
3395 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003396 # Only server setting is required. Other settings can be absent.
3397 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003398 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003399 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3400 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003401 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003402 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3403 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003404 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3405 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003406 SetProperty(
3407 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003408
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003409 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003410 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003411
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003412 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003413 RunGit(['config', 'gerrit.squash-uploads',
3414 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003415
tandrii@chromium.org28253532016-04-14 13:46:56 +00003416 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003417 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003418 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3419
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003420 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003421 # should be of the form
3422 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3423 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003424 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3425 keyvals['ORIGIN_URL_CONFIG']])
3426
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003427
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003428def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003429 """Downloads a network object to a local file, like urllib.urlretrieve.
3430
3431 This is necessary because urllib is broken for SSL connections via a proxy.
3432 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003433 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003434 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003435
3436
ukai@chromium.org712d6102013-11-27 00:52:58 +00003437def hasSheBang(fname):
3438 """Checks fname is a #! script."""
3439 with open(fname) as f:
3440 return f.read(2).startswith('#!')
3441
3442
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003443def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003444 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003445
3446 Args:
3447 force: True to update hooks. False to install hooks if not present.
3448 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003449 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003450 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3451 if not os.access(dst, os.X_OK):
3452 if os.path.exists(dst):
3453 if not force:
3454 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003455 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003456 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003457 if not hasSheBang(dst):
3458 DieWithError('Not a script: %s\n'
3459 'You need to download from\n%s\n'
3460 'into .git/hooks/commit-msg and '
3461 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003462 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3463 except Exception:
3464 if os.path.exists(dst):
3465 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003466 DieWithError('\nFailed to download hooks.\n'
3467 'You need to download from\n%s\n'
3468 'into .git/hooks/commit-msg and '
3469 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470
3471
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003472class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003473 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003474
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003475 def __init__(self):
3476 # Cached list of [host, identity, source], where source is either
3477 # .gitcookies or .netrc.
3478 self._all_hosts = None
3479
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003480 def ensure_configured_gitcookies(self):
3481 """Runs checks and suggests fixes to make git use .gitcookies from default
3482 path."""
3483 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3484 configured_path = RunGitSilent(
3485 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003486 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003487 if configured_path:
3488 self._ensure_default_gitcookies_path(configured_path, default)
3489 else:
3490 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003491
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003492 @staticmethod
3493 def _ensure_default_gitcookies_path(configured_path, default_path):
3494 assert configured_path
3495 if configured_path == default_path:
3496 print('git is already configured to use your .gitcookies from %s' %
3497 configured_path)
3498 return
3499
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003500 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003501 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3502 (configured_path, default_path))
3503
3504 if not os.path.exists(configured_path):
3505 print('However, your configured .gitcookies file is missing.')
3506 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3507 action='reconfigure')
3508 RunGit(['config', '--global', 'http.cookiefile', default_path])
3509 return
3510
3511 if os.path.exists(default_path):
3512 print('WARNING: default .gitcookies file already exists %s' %
3513 default_path)
3514 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3515 default_path)
3516
3517 confirm_or_exit('Move existing .gitcookies to default location?',
3518 action='move')
3519 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003520 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003521 print('Moved and reconfigured git to use .gitcookies from %s' %
3522 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 @staticmethod
3525 def _configure_gitcookies_path(default_path):
3526 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3527 if os.path.exists(netrc_path):
3528 print('You seem to be using outdated .netrc for git credentials: %s' %
3529 netrc_path)
3530 print('This tool will guide you through setting up recommended '
3531 '.gitcookies store for git credentials.\n'
3532 '\n'
3533 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3534 ' git config --global --unset http.cookiefile\n'
3535 ' mv %s %s.backup\n\n' % (default_path, default_path))
3536 confirm_or_exit(action='setup .gitcookies')
3537 RunGit(['config', '--global', 'http.cookiefile', default_path])
3538 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003539
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003540 def get_hosts_with_creds(self, include_netrc=False):
3541 if self._all_hosts is None:
3542 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003543 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3544 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3545 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3546 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003547
3548 if include_netrc:
3549 return self._all_hosts
3550 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3551
3552 def print_current_creds(self, include_netrc=False):
3553 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3554 if not hosts:
3555 print('No Git/Gerrit credentials found')
3556 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003557 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003558 header = [('Host', 'User', 'Which file'),
3559 ['=' * l for l in lengths]]
3560 for row in (header + hosts):
3561 print('\t'.join((('%%+%ds' % l) % s)
3562 for l, s in zip(lengths, row)))
3563
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003564 @staticmethod
3565 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003566 """Parses identity "git-<username>.domain" into <username> and domain."""
3567 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003568 # distinguishable from sub-domains. But we do know typical domains:
3569 if identity.endswith('.chromium.org'):
3570 domain = 'chromium.org'
3571 username = identity[:-len('.chromium.org')]
3572 else:
3573 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003574 if username.startswith('git-'):
3575 username = username[len('git-'):]
3576 return username, domain
3577
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003578 def has_generic_host(self):
3579 """Returns whether generic .googlesource.com has been configured.
3580
3581 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3582 """
3583 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003584 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003585 return True
3586 return False
3587
3588 def _get_git_gerrit_identity_pairs(self):
3589 """Returns map from canonic host to pair of identities (Git, Gerrit).
3590
3591 One of identities might be None, meaning not configured.
3592 """
3593 host_to_identity_pairs = {}
3594 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003595 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003596 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3597 idx = 0 if canonical == host else 1
3598 pair[idx] = identity
3599 return host_to_identity_pairs
3600
3601 def get_partially_configured_hosts(self):
3602 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003603 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003604 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003605 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003606
3607 def get_conflicting_hosts(self):
3608 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003609 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003610 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003611 if None not in (i1, i2) and i1 != i2)
3612
3613 def get_duplicated_hosts(self):
3614 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003615 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003616
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003617
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003618 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003619 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003620 hosts = sorted(hosts)
3621 assert hosts
3622 if extra_column_func is None:
3623 extras = [''] * len(hosts)
3624 else:
3625 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003626 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3627 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003628 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003629 lines.append(tmpl % he)
3630 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003632 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 yield ('.googlesource.com wildcard record detected',
3635 ['Chrome Infrastructure team recommends to list full host names '
3636 'explicitly.'],
3637 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638
3639 dups = self.get_duplicated_hosts()
3640 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 yield ('The following hosts were defined twice',
3642 self._format_hosts(dups),
3643 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003644
3645 partial = self.get_partially_configured_hosts()
3646 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003647 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3648 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003649 self._format_hosts(
3650 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3651 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003652
3653 conflicting = self.get_conflicting_hosts()
3654 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003655 yield ('The following Git hosts have differing credentials from their '
3656 'Gerrit counterparts',
3657 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3658 tuple(self._get_git_gerrit_identity_pairs()[host])),
3659 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003660
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003661 def find_and_report_problems(self):
3662 """Returns True if there was at least one problem, else False."""
3663 found = False
3664 bad_hosts = set()
3665 for title, sublines, hosts in self._find_problems():
3666 if not found:
3667 found = True
3668 print('\n\n.gitcookies problem report:\n')
3669 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003670 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003671 if sublines:
3672 print()
3673 print(' %s' % '\n '.join(sublines))
3674 print()
3675
3676 if bad_hosts:
3677 assert found
3678 print(' You can manually remove corresponding lines in your %s file and '
3679 'visit the following URLs with correct account to generate '
3680 'correct credential lines:\n' %
3681 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003682 print(' %s' % '\n '.join(
3683 sorted(
3684 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3685 _canonical_git_googlesource_host(host))
3686 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003687 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003688
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003689
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003690@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003691def CMDcreds_check(parser, args):
3692 """Checks credentials and suggests changes."""
3693 _, _ = parser.parse_args(args)
3694
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003695 # Code below checks .gitcookies. Abort if using something else.
3696 authn = gerrit_util.Authenticator.get()
3697 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003698 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003699 'This command is not designed for bot environment. It checks '
3700 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003701 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3702 if isinstance(authn, gerrit_util.GceAuthenticator):
3703 message += (
3704 '\n'
3705 'If you need to run this on GCE or a cloudtop instance, '
3706 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3707 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003708
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003709 checker = _GitCookiesChecker()
3710 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003711
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003712 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003713 checker.print_current_creds(include_netrc=True)
3714
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003715 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003716 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003717 return 0
3718 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003719
3720
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003721@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003722def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003723 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003724 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003725 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003726 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003727 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003728 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003729 return RunGit(['config', 'branch.%s.base-url' % branch],
3730 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003731
3732 print('Setting base-url to %s' % args[0])
3733 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3734 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003735
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003736
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003737def color_for_status(status):
3738 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003739 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003740 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003741 'unsent': BOLD + Fore.YELLOW,
3742 'waiting': BOLD + Fore.RED,
3743 'reply': BOLD + Fore.YELLOW,
3744 'not lgtm': BOLD + Fore.RED,
3745 'lgtm': BOLD + Fore.GREEN,
3746 'commit': BOLD + Fore.MAGENTA,
3747 'closed': BOLD + Fore.CYAN,
3748 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003749 }.get(status, Fore.WHITE)
3750
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003751
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003752def get_cl_statuses(changes, fine_grained, max_processes=None):
3753 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003754
3755 If fine_grained is true, this will fetch CL statuses from the server.
3756 Otherwise, simply indicate if there's a matching url for the given branches.
3757
3758 If max_processes is specified, it is used as the maximum number of processes
3759 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3760 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003761
3762 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003763 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003764 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003765 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003766
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003767 if not fine_grained:
3768 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003769 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003770 for cl in changes:
3771 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003772 return
3773
3774 # First, sort out authentication issues.
3775 logging.debug('ensuring credentials exist')
3776 for cl in changes:
3777 cl.EnsureAuthenticated(force=False, refresh=True)
3778
3779 def fetch(cl):
3780 try:
3781 return (cl, cl.GetStatus())
3782 except:
3783 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003784 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003785 raise
3786
3787 threads_count = len(changes)
3788 if max_processes:
3789 threads_count = max(1, min(threads_count, max_processes))
3790 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3791
Edward Lemur61bf4172020-02-24 23:22:37 +00003792 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003793 fetched_cls = set()
3794 try:
3795 it = pool.imap_unordered(fetch, changes).__iter__()
3796 while True:
3797 try:
3798 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003799 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003800 break
3801 fetched_cls.add(cl)
3802 yield cl, status
3803 finally:
3804 pool.close()
3805
3806 # Add any branches that failed to fetch.
3807 for cl in set(changes) - fetched_cls:
3808 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003809
rmistry@google.com2dd99862015-06-22 12:22:18 +00003810
Jose Lopes3863fc52020-04-07 17:00:25 +00003811def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003812 """Uploads CLs of local branches that are dependents of the current branch.
3813
3814 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003815
3816 test1 -> test2.1 -> test3.1
3817 -> test3.2
3818 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003819
3820 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3821 run on the dependent branches in this order:
3822 test2.1, test3.1, test3.2, test2.2, test3.3
3823
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003824 Note: This function does not rebase your local dependent branches. Use it
3825 when you make a change to the parent branch that will not conflict
3826 with its dependent branches, and you would like their dependencies
3827 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003828 """
3829 if git_common.is_dirty_git_tree('upload-branch-deps'):
3830 return 1
3831
3832 root_branch = cl.GetBranch()
3833 if root_branch is None:
3834 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3835 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003836 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003837 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3838 'patchset dependencies without an uploaded CL.')
3839
3840 branches = RunGit(['for-each-ref',
3841 '--format=%(refname:short) %(upstream:short)',
3842 'refs/heads'])
3843 if not branches:
3844 print('No local branches found.')
3845 return 0
3846
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003847 # Create a dictionary of all local branches to the branches that are
3848 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003849 tracked_to_dependents = collections.defaultdict(list)
3850 for b in branches.splitlines():
3851 tokens = b.split()
3852 if len(tokens) == 2:
3853 branch_name, tracked = tokens
3854 tracked_to_dependents[tracked].append(branch_name)
3855
vapiera7fbd5a2016-06-16 09:17:49 -07003856 print()
3857 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003858 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003859
rmistry@google.com2dd99862015-06-22 12:22:18 +00003860 def traverse_dependents_preorder(branch, padding=''):
3861 dependents_to_process = tracked_to_dependents.get(branch, [])
3862 padding += ' '
3863 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003864 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003865 dependents.append(dependent)
3866 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003867
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003869 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870
3871 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003872 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 return 0
3874
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 # Record all dependents that failed to upload.
3876 failures = {}
3877 # Go through all dependents, checkout the branch and upload.
3878 try:
3879 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print()
3881 print('--------------------------------------')
3882 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885 try:
3886 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003889 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003892 finally:
3893 # Swap back to the original root branch.
3894 RunGit(['checkout', '-q', root_branch])
3895
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print()
3897 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 for dependent_branch in dependents:
3899 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print(' %s : %s' % (dependent_branch, upload_status))
3901 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003902
3903 return 0
3904
3905
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003906def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003907 """Given a proposed tag name, returns a tag name that is guaranteed to be
3908 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3909 or 'foo-3', and so on."""
3910
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003911 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003912 for suffix_num in itertools.count(1):
3913 if suffix_num == 1:
3914 to_check = proposed_tag
3915 else:
3916 to_check = '%s-%d' % (proposed_tag, suffix_num)
3917
3918 if to_check not in existing_tags:
3919 return to_check
3920
3921
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003922@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003923def CMDarchive(parser, args):
3924 """Archives and deletes branches associated with closed changelists."""
3925 parser.add_option(
3926 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003927 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003928 parser.add_option(
3929 '-f', '--force', action='store_true',
3930 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003931 parser.add_option(
3932 '-d', '--dry-run', action='store_true',
3933 help='Skip the branch tagging and removal steps.')
3934 parser.add_option(
3935 '-t', '--notags', action='store_true',
3936 help='Do not tag archived branches. '
3937 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003938 parser.add_option(
3939 '-p',
3940 '--pattern',
3941 default='git-cl-archived-{issue}-{branch}',
3942 help='Format string for archive tags. '
3943 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003944
kmarshall3bff56b2016-06-06 18:31:47 -07003945 options, args = parser.parse_args(args)
3946 if args:
3947 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003948
3949 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3950 if not branches:
3951 return 0
3952
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003953 tags = RunGit(['for-each-ref', '--format=%(refname)',
3954 'refs/tags']).splitlines() or []
3955 tags = [t.split('/')[-1] for t in tags]
3956
vapiera7fbd5a2016-06-16 09:17:49 -07003957 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003958 changes = [Changelist(branchref=b)
3959 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003960 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3961 statuses = get_cl_statuses(changes,
3962 fine_grained=True,
3963 max_processes=options.maxjobs)
3964 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003965 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3966 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003967 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003968 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003969 proposal.sort()
3970
3971 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003973 return 0
3974
Edward Lemur85153282020-02-14 22:06:29 +00003975 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003976
vapiera7fbd5a2016-06-16 09:17:49 -07003977 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003978 if options.notags:
3979 for next_item in proposal:
3980 print(' ' + next_item[0])
3981 else:
3982 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3983 for next_item in proposal:
3984 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003985
kmarshall9249e012016-08-23 12:02:16 -07003986 # Quit now on precondition failure or if instructed by the user, either
3987 # via an interactive prompt or by command line flags.
3988 if options.dry_run:
3989 print('\nNo changes were made (dry run).\n')
3990 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003991
3992 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003993 print('You are currently on a branch \'%s\' which is associated with a '
3994 'closed codereview issue, so archive cannot proceed. Please '
3995 'checkout another branch and run this command again.' %
3996 current_branch)
3997 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003998
3999 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004000 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004001 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004002 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004003 return 1
4004
4005 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004006 if not options.notags:
4007 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004008
4009 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4010 # Clean up the tag if we failed to delete the branch.
4011 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004012
vapiera7fbd5a2016-06-16 09:17:49 -07004013 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004014
4015 return 0
4016
4017
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004018@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004020 """Show status of changelists.
4021
4022 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004023 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004024 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004025 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004026 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004027 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004028 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004029 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004030
4031 Also see 'git cl comments'.
4032 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004033 parser.add_option(
4034 '--no-branch-color',
4035 action='store_true',
4036 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004037 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004038 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004039 parser.add_option('-f', '--fast', action='store_true',
4040 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004041 parser.add_option(
4042 '-j', '--maxjobs', action='store', type=int,
4043 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004044 parser.add_option(
4045 '-i', '--issue', type=int,
4046 help='Operate on this issue instead of the current branch\'s implicit '
4047 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004048 parser.add_option('-d',
4049 '--date-order',
4050 action='store_true',
4051 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004052 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004053 if args:
4054 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004055
iannuccie53c9352016-08-17 14:40:40 -07004056 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004057 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004060 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004062 if cl.GetIssue():
4063 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004064 elif options.field == 'id':
4065 issueid = cl.GetIssue()
4066 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004067 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004068 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004069 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004071 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004072 elif options.field == 'status':
4073 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074 elif options.field == 'url':
4075 url = cl.GetIssueURL()
4076 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004078 return 0
4079
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004080 branches = RunGit([
4081 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4082 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004083 if not branches:
4084 print('No local branch found.')
4085 return 0
4086
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004087 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004088 Changelist(branchref=b, commit_date=ct)
4089 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4090 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004091 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004092 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004093 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004094 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004095
Edward Lemur85153282020-02-14 22:06:29 +00004096 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004097
4098 def FormatBranchName(branch, colorize=False):
4099 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4100 an asterisk when it is the current branch."""
4101
4102 asterisk = ""
4103 color = Fore.RESET
4104 if branch == current_branch:
4105 asterisk = "* "
4106 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004107 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004108
4109 if colorize:
4110 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004111 return asterisk + branch_name
4112
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004113 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004114
4115 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004116
4117 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004118 sorted_changes = sorted(changes,
4119 key=lambda c: c.GetCommitDate(),
4120 reverse=True)
4121 else:
4122 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4123 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004124 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004126 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004127 branch_statuses[c.GetBranch()] = status
4128 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004129 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004130 if url and (not status or status == 'error'):
4131 # The issue probably doesn't exist anymore.
4132 url += ' (broken)'
4133
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004134 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004135 # Turn off bold as well as colors.
4136 END = '\033[0m'
4137 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004138 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004139 color = ''
4140 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004141 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004142
Alan Cuttera3be9a52019-03-04 18:50:33 +00004143 branch_display = FormatBranchName(branch)
4144 padding = ' ' * (alignment - len(branch_display))
4145 if not options.no_branch_color:
4146 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004147
Alan Cuttera3be9a52019-03-04 18:50:33 +00004148 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4149 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004150
vapiera7fbd5a2016-06-16 09:17:49 -07004151 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004152 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004153 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004154 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004155 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004156 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004157 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004158 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004160 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004162 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004163 return 0
4164
4165
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004166def colorize_CMDstatus_doc():
4167 """To be called once in main() to add colors to git cl status help."""
4168 colors = [i for i in dir(Fore) if i[0].isupper()]
4169
4170 def colorize_line(line):
4171 for color in colors:
4172 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004173 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004174 indent = len(line) - len(line.lstrip(' ')) + 1
4175 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4176 return line
4177
4178 lines = CMDstatus.__doc__.splitlines()
4179 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4180
4181
phajdan.jre328cf92016-08-22 04:12:17 -07004182def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004183 if path == '-':
4184 json.dump(contents, sys.stdout)
4185 else:
4186 with open(path, 'w') as f:
4187 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004188
4189
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004190@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004191@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004193 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194
4195 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004196 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004197 parser.add_option('-r', '--reverse', action='store_true',
4198 help='Lookup the branch(es) for the specified issues. If '
4199 'no issues are specified, all branches with mapped '
4200 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004201 parser.add_option('--json',
4202 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004203 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204
dnj@chromium.org406c4402015-03-03 17:22:28 +00004205 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004206 branches = RunGit(['for-each-ref', 'refs/heads',
4207 '--format=%(refname)']).splitlines()
4208 # Reverse issue lookup.
4209 issue_branch_map = {}
4210
4211 git_config = {}
4212 for config in RunGit(['config', '--get-regexp',
4213 r'branch\..*issue']).splitlines():
4214 name, _space, val = config.partition(' ')
4215 git_config[name] = val
4216
4217 for branch in branches:
4218 issue = git_config.get(
4219 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4220 if issue:
4221 issue_branch_map.setdefault(int(issue), []).append(branch)
4222 if not args:
4223 args = sorted(issue_branch_map.keys())
4224 result = {}
4225 for issue in args:
4226 try:
4227 issue_num = int(issue)
4228 except ValueError:
4229 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4230 continue
4231 result[issue_num] = issue_branch_map.get(issue_num)
4232 print('Branch for issue number %s: %s' %
4233 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4234 if options.json:
4235 write_json(options.json, result)
4236 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004237
4238 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004239 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004240 if not issue.valid:
4241 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4242 'or no argument to list it.\n'
4243 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004244 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004245 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004246 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004247 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004248 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4249 if options.json:
4250 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004251 'gerrit_host': cl.GetGerritHost(),
4252 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004253 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004254 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004255 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 return 0
4257
4258
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004259@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004260def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004261 """Shows or posts review comments for any changelist."""
4262 parser.add_option('-a', '--add-comment', dest='comment',
4263 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004264 parser.add_option('-p', '--publish', action='store_true',
4265 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004266 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004267 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004268 parser.add_option('-m', '--machine-readable', dest='readable',
4269 action='store_false', default=True,
4270 help='output comments in a format compatible with '
4271 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004272 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004273 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004274 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004275
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 issue = None
4277 if options.issue:
4278 try:
4279 issue = int(options.issue)
4280 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004281 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004282
Edward Lemur934836a2019-09-09 20:16:54 +00004283 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004284
4285 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004286 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004287 return 0
4288
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004289 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4290 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004291 for comment in summary:
4292 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004293 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004294 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004295 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004296 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004297 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004298 elif comment.autogenerated:
4299 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300 else:
4301 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004302 print('\n%s%s %s%s\n%s' % (
4303 color,
4304 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4305 comment.sender,
4306 Fore.RESET,
4307 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4308
smut@google.comc85ac942015-09-15 16:34:43 +00004309 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004310 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004311 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004312 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4313 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004314 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004315 return 0
4316
4317
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004318@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004319@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004320def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004321 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004322 parser.add_option('-d', '--display', action='store_true',
4323 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004324 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004325 help='New description to set for this issue (- for stdin, '
4326 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004327 parser.add_option('-f', '--force', action='store_true',
4328 help='Delete any unpublished Gerrit edits for this issue '
4329 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004330
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004331 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004332
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004333 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004335 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004336 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004337 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004338
Edward Lemur934836a2019-09-09 20:16:54 +00004339 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004340 if target_issue_arg:
4341 kwargs['issue'] = target_issue_arg.issue
4342 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004343
4344 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004345 if not cl.GetIssue():
4346 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004347
Edward Lemur678a6842019-10-03 22:25:05 +00004348 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004349 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004350
Edward Lemur6c6827c2020-02-06 21:15:18 +00004351 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004352
smut@google.com34fb6b12015-07-13 20:03:26 +00004353 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004354 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004355 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004356
4357 if options.new_description:
4358 text = options.new_description
4359 if text == '-':
4360 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004361 elif text == '+':
4362 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004363 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004364
4365 description.set_description(text)
4366 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004367 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004368 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004369 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004370 return 0
4371
4372
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004373@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004374def CMDlint(parser, args):
4375 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004376 parser.add_option('--filter', action='append', metavar='-x,+y',
4377 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004378 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004379
4380 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004381 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004382 try:
4383 import cpplint
4384 import cpplint_chromium
4385 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004387 return 1
4388
4389 # Change the current working directory before calling lint so that it
4390 # shows the correct base.
4391 previous_cwd = os.getcwd()
4392 os.chdir(settings.GetRoot())
4393 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004394 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004395 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004396 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004397 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004398 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004399
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004400 # Process cpplint arguments, if any.
4401 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4402 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004403 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004404
Lei Zhang379d1ad2020-07-15 19:40:06 +00004405 include_regex = re.compile(settings.GetLintRegex())
4406 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4408 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004409 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004410 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004411 continue
4412
4413 if ignore_regex.match(filename):
4414 print('Ignoring file %s' % filename)
4415 continue
4416
4417 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4418 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004419 finally:
4420 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004421 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004422 if cpplint._cpplint_state.error_count != 0:
4423 return 1
4424 return 0
4425
4426
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004427@metrics.collector.collect_metrics('git cl presubmit')
mlcuic601e362023-08-14 23:39:46 +00004428@subcommand.usage('[base branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004429def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004430 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004431 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004432 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004433 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004434 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004435 parser.add_option('--all', action='store_true',
4436 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004437 parser.add_option('--files',
4438 nargs=1,
4439 help='Semicolon-separated list of files to be marked as '
4440 'modified when executing presubmit or post-upload hooks. '
4441 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004442 parser.add_option('--parallel', action='store_true',
4443 help='Run all tests specified by input_api.RunTests in all '
4444 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004445 parser.add_option('--resultdb', action='store_true',
4446 help='Run presubmit checks in the ResultSink environment '
4447 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004448 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004449 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004450
sbc@chromium.org71437c02015-04-09 19:29:40 +00004451 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004452 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004453 return 1
4454
Edward Lemur934836a2019-09-09 20:16:54 +00004455 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004456 if args:
4457 base_branch = args[0]
4458 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004459 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004460 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004462 start = time.time()
4463 try:
4464 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4465 description = cl.FetchDescription()
4466 else:
4467 description = _create_description_from_log([base_branch])
4468 except Exception as e:
4469 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004470 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004471 elapsed = time.time() - start
4472 if elapsed > 5:
4473 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004474
Bruce Dawson13acea32022-05-03 22:13:08 +00004475 if not base_branch:
4476 if not options.force:
4477 print('use --force to check even when not on a branch.')
4478 return 1
4479 base_branch = 'HEAD'
4480
Josip Sokcevic017544d2022-03-31 23:47:53 +00004481 cl.RunHook(committing=not options.upload,
4482 may_prompt=False,
4483 verbose=options.verbose,
4484 parallel=options.parallel,
4485 upstream=base_branch,
4486 description=description,
4487 all_files=options.all,
4488 files=options.files,
4489 resultdb=options.resultdb,
4490 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004491 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004492
4493
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004494def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004495 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004496
4497 Works the same way as
4498 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4499 but can be called on demand on all platforms.
4500
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004501 The basic idea is to generate git hash of a state of the tree, original
4502 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004503 """
4504 lines = []
4505 tree_hash = RunGitSilent(['write-tree'])
4506 lines.append('tree %s' % tree_hash.strip())
4507 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4508 if code == 0:
4509 lines.append('parent %s' % parent.strip())
4510 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4511 lines.append('author %s' % author.strip())
4512 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4513 lines.append('committer %s' % committer.strip())
4514 lines.append('')
4515 # Note: Gerrit's commit-hook actually cleans message of some lines and
4516 # whitespace. This code is not doing this, but it clearly won't decrease
4517 # entropy.
4518 lines.append(message)
4519 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004520 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004521 return 'I%s' % change_hash.strip()
4522
4523
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004524def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004525 """Computes the remote branch ref to use for the CL.
4526
4527 Args:
4528 remote (str): The git remote for the CL.
4529 remote_branch (str): The git remote branch for the CL.
4530 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004531 """
4532 if not (remote and remote_branch):
4533 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004534
wittman@chromium.org455dc922015-01-26 20:15:50 +00004535 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004536 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004537 # refs, which are then translated into the remote full symbolic refs
4538 # below.
4539 if '/' not in target_branch:
4540 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4541 else:
4542 prefix_replacements = (
4543 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4544 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4545 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4546 )
4547 match = None
4548 for regex, replacement in prefix_replacements:
4549 match = re.search(regex, target_branch)
4550 if match:
4551 remote_branch = target_branch.replace(match.group(0), replacement)
4552 break
4553 if not match:
4554 # This is a branch path but not one we recognize; use as-is.
4555 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004556 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004557 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004558 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004559 # Handle the refs that need to land in different refs.
4560 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004561
wittman@chromium.org455dc922015-01-26 20:15:50 +00004562 # Create the true path to the remote branch.
4563 # Does the following translation:
4564 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004565 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004566 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4567 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4568 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4569 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4570 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4571 'refs/heads/')
4572 elif remote_branch.startswith('refs/remotes/branch-heads'):
4573 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004574
wittman@chromium.org455dc922015-01-26 20:15:50 +00004575 return remote_branch
4576
4577
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004578def cleanup_list(l):
4579 """Fixes a list so that comma separated items are put as individual items.
4580
4581 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4582 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4583 """
4584 items = sum((i.split(',') for i in l), [])
4585 stripped_items = (i.strip() for i in items)
4586 return sorted(filter(None, stripped_items))
4587
4588
Aaron Gable4db38df2017-11-03 14:59:07 -07004589@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004590@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004591def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004592 """Uploads the current changelist to codereview.
4593
4594 Can skip dependency patchset uploads for a branch by running:
4595 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004596 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004597 git config --unset branch.branch_name.skip-deps-uploads
4598 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004599
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004600 If the name of the checked out branch starts with "bug-" or "fix-" followed
4601 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004602 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004603
4604 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004605 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004606 [git-cl] add support for hashtags
4607 Foo bar: implement foo
4608 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004609 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004610 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4611 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004612 parser.add_option('--bypass-watchlists', action='store_true',
4613 dest='bypass_watchlists',
4614 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004615 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004616 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004617 parser.add_option('--message', '-m', dest='message',
4618 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004619 parser.add_option('-b', '--bug',
4620 help='pre-populate the bug number(s) for this issue. '
4621 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004622 parser.add_option('--message-file', dest='message_file',
4623 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004624 parser.add_option('--title', '-t', dest='title',
4625 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004626 parser.add_option('-T', '--skip-title', action='store_true',
4627 dest='skip_title',
4628 help='Use the most recent commit message as the title of '
4629 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004630 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004631 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004632 help='reviewer email addresses')
4633 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004634 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004635 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004636 parser.add_option('--hashtag', dest='hashtags',
4637 action='append', default=[],
4638 help=('Gerrit hashtag for new CL; '
4639 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004640 parser.add_option('-s',
4641 '--send-mail',
4642 '--send-email',
4643 dest='send_mail',
4644 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004645 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004646 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004647 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004648 metavar='TARGET',
4649 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004650 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004651 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004652 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004653 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004654 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004655 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004656 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004657 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4658 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004659 parser.add_option('-c',
4660 '--use-commit-queue',
4661 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004662 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004663 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004664 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004665 parser.add_option('-d', '--cq-dry-run',
4666 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004667 help='Send the patchset to do a CQ dry run right after '
4668 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004669 parser.add_option('--set-bot-commit', action='store_true',
4670 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004671 parser.add_option('--preserve-tryjobs', action='store_true',
4672 help='instruct the CQ to let tryjobs running even after '
4673 'new patchsets are uploaded instead of canceling '
4674 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004675 parser.add_option('--dependencies', action='store_true',
4676 help='Uploads CLs of all the local branches that depend on '
4677 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004678 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4679 help='Sends your change to the CQ after an approval. Only '
4680 'works on repos that have the Auto-Submit label '
4681 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004682 parser.add_option('--parallel', action='store_true',
4683 help='Run all tests specified by input_api.RunTests in all '
4684 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004685 parser.add_option('--no-autocc', action='store_true',
4686 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004687 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004688 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004689 parser.add_option('-R', '--retry-failed', action='store_true',
4690 help='Retry failed tryjobs from old patchset immediately '
4691 'after uploading new patchset. Cannot be used with '
4692 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004693 parser.add_option('--fixed', '-x',
4694 help='List of bugs that will be commented on and marked '
4695 'fixed (pre-populates "Fixed:" tag). Same format as '
4696 '-b option / "Bug:" tag. If fixing several issues, '
4697 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004698 parser.add_option('--edit-description', action='store_true', default=False,
4699 help='Modify description before upload. Cannot be used '
4700 'with --force. It is a noop when --no-squash is set '
4701 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004702 parser.add_option('--git-completion-helper', action="store_true",
4703 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004704 parser.add_option('-o',
4705 '--push-options',
4706 action='append',
4707 default=[],
4708 help='Transmit the given string to the server when '
4709 'performing git push (pass-through). See git-push '
4710 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004711 parser.add_option('--no-add-changeid',
4712 action='store_true',
4713 dest='no_add_changeid',
4714 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004715 parser.add_option('--cherry-pick-stacked',
4716 '--cp',
4717 dest='cherry_pick_stacked',
4718 action='store_true',
4719 help='If parent branch has un-uploaded updates, '
4720 'automatically skip parent branches and just upload '
4721 'the current branch cherry-pick on its parent\'s last '
4722 'uploaded commit. Allows users to skip the potential '
4723 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004724 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004725
rmistry@google.com2dd99862015-06-22 12:22:18 +00004726 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004727 (options, args) = parser.parse_args(args)
4728
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004729 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004730 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4731 if opt.help != optparse.SUPPRESS_HELP))
4732 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004733
Aravind Vasudevanb8164182023-08-25 21:49:12 +00004734 # TODO(crbug.com/1475405): Warn users if the project uses submodules and
4735 # they have fsmonitor enabled.
4736 if os.path.isfile('.gitmodules'):
4737 git_common.warn_submodule()
4738
sbc@chromium.org71437c02015-04-09 19:29:40 +00004739 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004740 return 1
4741
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004742 options.reviewers = cleanup_list(options.reviewers)
4743 options.cc = cleanup_list(options.cc)
4744
Josipe827b0f2020-01-30 00:07:20 +00004745 if options.edit_description and options.force:
4746 parser.error('Only one of --force and --edit-description allowed')
4747
tandriib80458a2016-06-23 12:20:07 -07004748 if options.message_file:
4749 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004750 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004751 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004752
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004753 if ([options.cq_dry_run,
4754 options.use_commit_queue,
4755 options.retry_failed].count(True) > 1):
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00004756 parser.error('Only one of --use-commit-queue, --cq-dry-run or '
4757 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004758
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004759 if options.skip_title and options.title:
4760 parser.error('Only one of --title and --skip-title allowed.')
4761
Aaron Gableedbc4132017-09-11 13:22:28 -07004762 if options.use_commit_queue:
4763 options.send_mail = True
4764
Edward Lesmes0dd54822020-03-26 18:24:25 +00004765 if options.squash is None:
4766 # Load default for user, repo, squash=true, in this order.
4767 options.squash = settings.GetSquashGerritUploads()
4768
Joanna Wang5051ffe2023-03-01 22:24:07 +00004769 cl = Changelist(branchref=options.target_branch)
4770
4771 # Warm change details cache now to avoid RPCs later, reducing latency for
4772 # developers.
4773 if cl.GetIssue():
4774 cl._GetChangeDetail(
4775 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4776
4777 if options.retry_failed and not cl.GetIssue():
4778 print('No previous patchsets, so --retry-failed has no effect.')
4779 options.retry_failed = False
4780
Joanna Wang5051ffe2023-03-01 22:24:07 +00004781
Joanna Wang4786a412023-05-16 18:23:08 +00004782 disable_dogfood_stacked_changes = os.environ.get(
4783 DOGFOOD_STACKED_CHANGES_VAR) == '0'
4784 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'
4785
4786 # Only print message for folks who don't have DOGFOOD_STACKED_CHANGES set
4787 # to an expected value.
4788 if (options.squash and not dogfood_stacked_changes
4789 and not disable_dogfood_stacked_changes):
Joanna Wang1398e4f2023-05-01 18:49:13 +00004790 print(
4791 'This repo has been enrolled in the stacked changes dogfood.\n'
4792 '`git cl upload` now uploads the current branch and all upstream '
4793 'branches that have un-uploaded updates.\n'
4794 'Patches can now be reapplied with --force:\n'
4795 '`git cl patch --reapply --force`.\n'
4796 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
Joanna Wang4786a412023-05-16 18:23:08 +00004797 '\n'
4798 'Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4799 '"Set new changes to "work in progress" by default" checkbox at\n'
4800 'https://<host>-review.googlesource.com/settings/\n'
4801 '\n'
4802 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.\n'
4803 'To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004804 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004805
Joanna Wang4786a412023-05-16 18:23:08 +00004806 if options.squash and not disable_dogfood_stacked_changes:
Joanna Wangdd12deb2023-01-26 20:43:28 +00004807 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004808 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004809
Joanna Wangd75fc882023-03-01 21:53:34 +00004810 if options.cherry_pick_stacked:
4811 try:
4812 orig_args.remove('--cherry-pick-stacked')
4813 except ValueError:
4814 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004815 UploadAllSquashed(options, orig_args)
4816 return 0
4817
Joanna Wangd75fc882023-03-01 21:53:34 +00004818 if options.cherry_pick_stacked:
4819 parser.error('--cherry-pick-stacked is not available for this workflow.')
4820
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004821 # cl.GetMostRecentPatchset uses cached information, and can return the last
4822 # patchset before upload. Calling it here makes it clear that it's the
4823 # last patchset before upload. Note that GetMostRecentPatchset will fail
4824 # if no CL has been uploaded yet.
4825 if options.retry_failed:
4826 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004827
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004828 ret = cl.CMDUpload(options, args, orig_args)
4829
4830 if options.retry_failed:
4831 if ret != 0:
4832 print('Upload failed, so --retry-failed has no effect.')
4833 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004834 builds, _ = _fetch_latest_builds(cl,
4835 DEFAULT_BUILDBUCKET_HOST,
4836 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004837 jobs = _filter_failed_for_retry(builds)
4838 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004839 print('No failed tryjobs, so --retry-failed has no effect.')
4840 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004841 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004842
4843 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004844
4845
Joanna Wang18de1f62023-01-21 01:24:24 +00004846def UploadAllSquashed(options, orig_args):
4847 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4848 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004849 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004850
Joanna Wangc710e2d2023-01-25 14:53:22 +00004851 # Create commits.
4852 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4853 if cherry_pick_current:
4854 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4855 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4856 uploads_by_cl.append((cls[0], new_upload))
4857 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004858 ordered_cls = list(reversed(cls))
4859
Joanna Wang6215dd02023-02-07 15:58:03 +00004860 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004861 # We can only support external changes when we're only uploading one
4862 # branch.
4863 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004864 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004865 if parent is None:
4866 origin = '.'
4867 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004868
Joanna Wang7603f042023-03-01 22:17:36 +00004869 while origin == '.':
4870 # Search for cl's closest ancestor with a gerrit hash.
4871 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4872 if origin == '.':
4873 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4874
4875 # Support the `git merge` and `git pull` workflow.
4876 if upstream_branch in ['master', 'main']:
4877 parent = cl.GetCommonAncestorWithUpstream()
4878 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004879 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4880 upstream_branch,
4881 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004882 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4883 upstream_branch,
4884 GERRIT_SQUASH_HASH_CONFIG_KEY)
4885 if parent:
4886 break
4887 branch = upstream_branch
4888 else:
4889 # Either the root of the tree is the cl's direct parent and the while
4890 # loop above only found empty branches between cl and the root of the
4891 # tree.
4892 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004893
Joanna Wang05b60342023-03-29 20:25:57 +00004894 if orig_parent is None:
4895 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004896 for i, cl in enumerate(ordered_cls):
4897 # If we're in the middle of the stack, set end_commit to downstream's
4898 # direct ancestor.
4899 if i + 1 < len(ordered_cls):
4900 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4901 else:
4902 child_base_commit = None
4903 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004904 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004905 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004906 end_commit=child_base_commit)
4907 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004908 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004909 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004910
4911 # Create refspec options
4912 cl, new_upload = uploads_by_cl[-1]
4913 refspec_opts = cl._GetRefSpecOptions(
4914 options,
4915 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004916 multi_change_upload=len(uploads_by_cl) > 1,
4917 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004918 refspec_suffix = ''
4919 if refspec_opts:
4920 refspec_suffix = '%' + ','.join(refspec_opts)
4921 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4922 refspec_suffix)
4923
4924 remote, remote_branch = cl.GetRemoteBranch()
4925 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4926 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4927 refspec_suffix)
4928
4929 # Git push
4930 git_push_metadata = {
4931 'gerrit_host':
4932 cl.GetGerritHost(),
4933 'title':
4934 options.title or '<untitled>',
4935 'change_id':
4936 git_footers.get_footer_change_id(new_upload.change_desc.description),
4937 'description':
4938 new_upload.change_desc.description,
4939 }
4940 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004941 git_push_metadata,
4942 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004943
4944 # Post push updates
4945 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4946 change_numbers = [
4947 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4948 ]
4949
4950 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4951 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4952
4953 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004954
4955
4956def _UploadAllPrecheck(options, orig_args):
4957 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4958 """Checks the state of the tree and gives the user uploading options
4959
4960 Returns: A tuple of the ordered list of changes that have new commits
4961 since their last upload and a boolean of whether the user wants to
4962 cherry-pick and upload the current branch instead of uploading all cls.
4963 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004964 cl = Changelist()
4965 if cl.GetBranch() is None:
4966 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4967
Joanna Wang18de1f62023-01-21 01:24:24 +00004968 branch_ref = None
4969 cls = []
4970 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004971 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004972
4973 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4974
4975 while True:
4976 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4977 DieWithError(
4978 'More than %s branches in the stack have not been uploaded.\n'
4979 'Are your branches in a misconfigured state?\n'
4980 'If not, please upload some upstream changes first.' %
4981 (_MAX_STACKED_BRANCHES_UPLOAD))
4982
4983 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004984
Joanna Wang6215dd02023-02-07 15:58:03 +00004985 # Only add CL if it has anything to commit.
4986 base_commit = cl.GetCommonAncestorWithUpstream()
4987 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4988
4989 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4990 if diff:
4991 cls.append(cl)
4992 if (not first_pass and
4993 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4994 # We are mid-stack and the user must upload their upstream branches.
4995 must_upload_upstream = True
4996 elif first_pass: # The current branch has nothing to commit. Exit.
4997 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4998 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4999 first_pass = False
5000
5001 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005002 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005003 branch_ref = upstream_branch_ref # set branch for next run.
5004
Joanna Wang6215dd02023-02-07 15:58:03 +00005005 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5006 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5007 upstream_branch,
5008 LAST_UPLOAD_HASH_CONFIG_KEY)
5009
Joanna Wang18de1f62023-01-21 01:24:24 +00005010 # Case 1: We've reached the beginning of the tree.
5011 if origin != '.':
5012 break
5013
Joanna Wang18de1f62023-01-21 01:24:24 +00005014 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005015 # the user MUST upload them unless they are empty. Continue to
5016 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005017 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005018 continue
5019
Joanna Wang18de1f62023-01-21 01:24:24 +00005020 # Case 3: If upstream's last_upload == cl.base_commit we do
5021 # not need to upload any more upstreams from this point on.
5022 # (Even if there may be diverged branches higher up the tree)
5023 if base_commit == upstream_last_upload:
5024 break
5025
5026 # Case 4: If upstream's last_upload < cl.base_commit we are
5027 # uploading cl and upstream_cl.
5028 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005029 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 continue
5031
5032 # Case 5: If cl.base_commit < upstream's last_upload the user
5033 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005034 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005035 DieWithError(
5036 'At least one branch in the stack has diverged from its upstream '
5037 'branch and does not contain its upstream\'s last upload.\n'
5038 'Please rebase the stack with `git rebase-update` before uploading.')
5039
5040 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5041 # any relation to commits in the tree. Continue up the tree until we hit
5042 # the root.
5043
5044 # We assume all cls in the stack have the same auth requirements and only
5045 # check this once.
5046 cls[0].EnsureAuthenticated(force=options.force)
5047
5048 cherry_pick = False
5049 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005050 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005051 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005052 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005053 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005054 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005055 msg = ('At least one parent branch in `%s` has never been uploaded '
5056 'and must be uploaded before/with `%s`.\n' %
5057 (branches, cls[1].branch))
5058 if options.cherry_pick_stacked:
5059 DieWithError(msg)
5060 if not options.force:
5061 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005062 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005063 if options.cherry_pick_stacked:
5064 print('cherry-picking `%s` on %s\'s last upload' %
5065 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005066 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005067 elif not options.force:
5068 answer = gclient_utils.AskForData(
5069 '\n' + opt_message +
5070 'Press enter to update branches %s.\nOr type `n` to upload only '
5071 '`%s` cherry-picked on %s\'s last upload:' %
5072 (branches, cls[0].branch, cls[1].branch))
5073 if answer.lower() == 'n':
5074 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005075 return cls, cherry_pick
5076
5077
Francois Dorayd42c6812017-05-30 15:10:20 -04005078@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005079@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005080def CMDsplit(parser, args):
5081 """Splits a branch into smaller branches and uploads CLs.
5082
5083 Creates a branch and uploads a CL for each group of files modified in the
5084 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005085 comment, the string '$directory', is replaced with the directory containing
5086 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005087 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005088 parser.add_option('-d', '--description', dest='description_file',
5089 help='A text file containing a CL description in which '
5090 '$directory will be replaced by each CL\'s directory.')
5091 parser.add_option('-c', '--comment', dest='comment_file',
5092 help='A text file containing a CL comment.')
5093 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005094 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005095 help='List the files and reviewers for each CL that would '
5096 'be created, but don\'t create branches or CLs.')
5097 parser.add_option('--cq-dry-run', action='store_true',
5098 help='If set, will do a cq dry run for each uploaded CL. '
5099 'Please be careful when doing this; more than ~10 CLs '
5100 'has the potential to overload our build '
5101 'infrastructure. Try to upload these not during high '
5102 'load times (usually 11-3 Mountain View time). Email '
5103 'infra-dev@chromium.org with any questions.')
Anne Redulla072d06e2023-07-06 23:12:16 +00005104 parser.add_option('-a',
5105 '--enable-auto-submit',
5106 action='store_true',
5107 dest='enable_auto_submit',
Takuto Ikuta51eca592019-02-14 19:40:52 +00005108 default=True,
5109 help='Sends your change to the CQ after an approval. Only '
Anne Redulla072d06e2023-07-06 23:12:16 +00005110 'works on repos that have the Auto-Submit label '
5111 'enabled')
5112 parser.add_option('--disable-auto-submit',
5113 action='store_false',
5114 dest='enable_auto_submit',
5115 help='Disables automatic sending of the changes to the CQ '
5116 'after approval. Note that auto-submit only works for '
5117 'repos that have the Auto-Submit label enabled.')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005118 parser.add_option('--max-depth',
5119 type='int',
5120 default=0,
5121 help='The max depth to look for OWNERS files. Useful for '
5122 'controlling the granularity of the split CLs, e.g. '
5123 '--max-depth=1 will only split by top-level '
5124 'directory. Specifying a value less than 1 means no '
5125 'limit on max depth.')
Rachael Newitt03e49122023-06-28 21:39:21 +00005126 parser.add_option('--topic',
5127 default=None,
5128 help='Topic to specify when uploading')
Francois Dorayd42c6812017-05-30 15:10:20 -04005129 options, _ = parser.parse_args(args)
5130
5131 if not options.description_file:
5132 parser.error('No --description flag specified.')
5133
5134 def WrappedCMDupload(args):
5135 return CMDupload(OptionParser(), args)
5136
Daniel Cheng403c44e2022-10-05 22:24:58 +00005137 return split_cl.SplitCl(options.description_file, options.comment_file,
5138 Changelist, WrappedCMDupload, options.dry_run,
5139 options.cq_dry_run, options.enable_auto_submit,
Rachael Newitt03e49122023-06-28 21:39:21 +00005140 options.max_depth, options.topic, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005141
5142
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005143@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005144@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005145def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005146 """DEPRECATED: Used to commit the current changelist via git-svn."""
5147 message = ('git-cl no longer supports committing to SVN repositories via '
5148 'git-svn. You probably want to use `git cl land` instead.')
5149 print(message)
5150 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005151
5152
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005153@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005154@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005155def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005156 """Commits the current changelist via git.
5157
5158 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5159 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005160 """
5161 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5162 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005163 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005164 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005165 parser.add_option('--parallel', action='store_true',
5166 help='Run all tests specified by input_api.RunTests in all '
5167 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005168 parser.add_option('--resultdb', action='store_true',
5169 help='Run presubmit checks in the ResultSink environment '
5170 'and send results to the ResultDB database.')
5171 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173
Edward Lemur934836a2019-09-09 20:16:54 +00005174 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005175
Robert Iannucci2e73d432018-03-14 01:10:47 -07005176 if not cl.GetIssue():
5177 DieWithError('You must upload the change first to Gerrit.\n'
5178 ' If you would rather have `git cl land` upload '
5179 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005180 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5181 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005182
5183
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005184@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005185@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005186def CMDpatch(parser, args):
Victor Hugo Vianna Silvadeff9a22023-07-11 18:07:18 +00005187 """Applies (cherry-picks) a Gerrit changelist locally."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005188 parser.add_option('-b', dest='newbranch',
5189 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005190 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005191 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005193 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005194
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005195 group = optparse.OptionGroup(
5196 parser,
5197 'Options for continuing work on the current issue uploaded from a '
5198 'different clone (e.g. different machine). Must be used independently '
5199 'from the other options. No issue number should be specified, and the '
5200 'branch must have an issue number associated with it')
5201 group.add_option('--reapply', action='store_true', dest='reapply',
5202 help='Reset the branch and reapply the issue.\n'
5203 'CAUTION: This will undo any local changes in this '
5204 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005205
5206 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005207 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005208 parser.add_option_group(group)
5209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005210 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005211
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005212 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005213 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005214 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005216 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005217
Edward Lemur934836a2019-09-09 20:16:54 +00005218 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005219 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005220 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005221
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005222 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005223 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005224 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005225
5226 RunGit(['reset', '--hard', upstream])
5227 if options.pull:
5228 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005229
Edward Lemur678a6842019-10-03 22:25:05 +00005230 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005231 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5232 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005233
5234 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005235 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005236
Edward Lemurf38bc172019-09-03 21:02:13 +00005237 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005238 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005239 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005240
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005241 # We don't want uncommitted changes mixed up with the patch.
5242 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005243 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005244
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005245 if options.newbranch:
5246 if options.force:
5247 RunGit(['branch', '-D', options.newbranch],
5248 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005249 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005250
Edward Lemur678a6842019-10-03 22:25:05 +00005251 cl = Changelist(
5252 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005253
Edward Lemur678a6842019-10-03 22:25:05 +00005254 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005255 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005256
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005257 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5258 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005259
5260
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005261def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005262 """Fetches the tree status and returns either 'open', 'closed',
5263 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005264 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005266 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005267 if status.find('closed') != -1 or status == '0':
5268 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005269
5270 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005272
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005273 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 return 'unset'
5275
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005276
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005277def GetTreeStatusReason():
5278 """Fetches the tree status from a json url and returns the message
5279 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005280 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005281 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005282 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 status = json.loads(connection.read())
5284 connection.close()
5285 return status['message']
5286
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005287
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005288@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005290 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005291 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005292 status = GetTreeStatus()
5293 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005294 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005295 return 2
5296
vapiera7fbd5a2016-06-16 09:17:49 -07005297 print('The tree is %s' % status)
5298 print()
5299 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005300 if status != 'open':
5301 return 1
5302 return 0
5303
5304
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005305@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005306def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005307 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5308 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005309 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005310 '-b', '--bot', action='append',
5311 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5312 'times to specify multiple builders. ex: '
5313 '"-b win_rel -b win_layout". See '
5314 'the try server waterfall for the builders name and the tests '
5315 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005316 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005317 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005318 help=('Buildbucket bucket to send the try requests. Format: '
5319 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005320 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005321 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005322 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005323 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005324 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005325 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005326 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005327 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005328 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005329 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005330 '--category', default='git_cl_try', help='Specify custom build category.')
5331 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005332 '--project',
5333 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005334 'in recipe to determine to which repository or directory to '
5335 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005336 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005337 '-p', '--property', dest='properties', action='append', default=[],
5338 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005339 'key2=value2 etc. The value will be treated as '
5340 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005341 'NOTE: using this may make your tryjob not usable for CQ, '
5342 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005343 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005344 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5345 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005346 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005347 parser.add_option(
5348 '-R', '--retry-failed', action='store_true', default=False,
5349 help='Retry failed jobs from the latest set of tryjobs. '
5350 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005351 parser.add_option(
5352 '-i', '--issue', type=int,
5353 help='Operate on this issue instead of the current branch\'s implicit '
5354 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005355 options, args = parser.parse_args(args)
5356
machenbach@chromium.org45453142015-09-15 08:45:22 +00005357 # Make sure that all properties are prop=value pairs.
5358 bad_params = [x for x in options.properties if '=' not in x]
5359 if bad_params:
5360 parser.error('Got properties with missing "=": %s' % bad_params)
5361
maruel@chromium.org15192402012-09-06 12:38:29 +00005362 if args:
5363 parser.error('Unknown arguments: %s' % args)
5364
Edward Lemur934836a2019-09-09 20:16:54 +00005365 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005366 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005367 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005368
Edward Lemurf38bc172019-09-03 21:02:13 +00005369 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005370 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005371
tandriie113dfd2016-10-11 10:20:12 -07005372 error_message = cl.CannotTriggerTryJobReason()
5373 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005374 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005375
Edward Lemur45768512020-03-02 19:03:14 +00005376 if options.bot:
5377 if options.retry_failed:
5378 parser.error('--bot is not compatible with --retry-failed.')
5379 if not options.bucket:
5380 parser.error('A bucket (e.g. "chromium/try") is required.')
5381
5382 triggered = [b for b in options.bot if 'triggered' in b]
5383 if triggered:
5384 parser.error(
5385 'Cannot schedule builds on triggered bots: %s.\n'
5386 'This type of bot requires an initial job from a parent (usually a '
5387 'builder). Schedule a job on the parent instead.\n' % triggered)
5388
5389 if options.bucket.startswith('.master'):
5390 parser.error('Buildbot masters are not supported.')
5391
5392 project, bucket = _parse_bucket(options.bucket)
5393 if project is None or bucket is None:
5394 parser.error('Invalid bucket: %s.' % options.bucket)
5395 jobs = sorted((project, bucket, bot) for bot in options.bot)
5396 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005397 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005398 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005399 if options.verbose:
5400 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005401 jobs = _filter_failed_for_retry(builds)
5402 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005403 print('There are no failed jobs in the latest set of jobs '
5404 '(patchset #%d), doing nothing.' % patchset)
5405 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005406 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005407 if num_builders > 10:
5408 confirm_or_exit('There are %d builders with failed builds.'
5409 % num_builders, action='continue')
5410 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005411 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005412 print('git cl try with no bots now defaults to CQ dry run.')
5413 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5414 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005415
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005416 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005417 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005418 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005419 except BuildbucketResponseException as ex:
5420 print('ERROR: %s' % ex)
5421 return 1
5422 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005423
5424
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005425@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005426def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005427 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005428 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005430 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005431 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005432 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005433 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005434 '--color', action='store_true', default=setup_color.IS_TTY,
5435 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005436 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005437 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5438 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005439 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005440 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005441 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005442 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005443 parser.add_option(
5444 '-i', '--issue', type=int,
5445 help='Operate on this issue instead of the current branch\'s implicit '
5446 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447 options, args = parser.parse_args(args)
5448 if args:
5449 parser.error('Unrecognized args: %s' % ' '.join(args))
5450
Edward Lemur934836a2019-09-09 20:16:54 +00005451 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005453 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005454
tandrii221ab252016-10-06 08:12:04 -07005455 patchset = options.patchset
5456 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005457 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005458 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005459 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005460 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005461 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005462 cl.GetIssue())
5463
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005464 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005465 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005466 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005467 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005468 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005469 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005470 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005471 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005472 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005473 return 0
5474
5475
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005476@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005477@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005478def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005479 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005480 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005481 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005482 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005483
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005484 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005485 if args:
5486 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005487 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005488 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005489 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005490 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005491
5492 # Clear configured merge-base, if there is one.
5493 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005494 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005495 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005496 return 0
5497
5498
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005499@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005500def CMDweb(parser, args):
5501 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005502 parser.add_option('-p',
5503 '--print-only',
5504 action='store_true',
5505 dest='print_only',
5506 help='Only print the Gerrit URL, don\'t open it in the '
5507 'browser.')
5508 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005509 if args:
5510 parser.error('Unrecognized args: %s' % ' '.join(args))
5511
5512 issue_url = Changelist().GetIssueURL()
5513 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005514 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005515 return 1
5516
Orr Bernstein0b960582022-12-22 20:16:18 +00005517 if options.print_only:
5518 print(issue_url)
5519 return 0
5520
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005521 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005522 # allows us to hide the "Created new window in existing browser session."
5523 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005524 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005525 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005526 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005527 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005528 os.open(os.devnull, os.O_RDWR)
5529 try:
5530 webbrowser.open(issue_url)
5531 finally:
5532 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005533 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005534 return 0
5535
5536
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005537@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005538def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005539 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005540 parser.add_option('-d', '--dry-run', action='store_true',
5541 help='trigger in dry run mode')
5542 parser.add_option('-c', '--clear', action='store_true',
5543 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005544 parser.add_option(
5545 '-i', '--issue', type=int,
5546 help='Operate on this issue instead of the current branch\'s implicit '
5547 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005548 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005549 if args:
5550 parser.error('Unrecognized args: %s' % ' '.join(args))
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00005551 if [options.dry_run, options.clear].count(True) > 1:
5552 parser.error('Only one of --dry-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005553
Edward Lemur934836a2019-09-09 20:16:54 +00005554 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005555 if not cl.GetIssue():
5556 parser.error('Must upload the issue first.')
5557
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005558 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005559 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005560 elif options.dry_run:
5561 state = _CQState.DRY_RUN
5562 else:
5563 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005564 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005565 return 0
5566
5567
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005568@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005569def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005570 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005571 parser.add_option(
5572 '-i', '--issue', type=int,
5573 help='Operate on this issue instead of the current branch\'s implicit '
5574 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005575 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005576 if args:
5577 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005578 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005579 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005580 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005581 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005582 cl.CloseIssue()
5583 return 0
5584
5585
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005586@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005587def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005588 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005589 parser.add_option(
5590 '--stat',
5591 action='store_true',
5592 dest='stat',
5593 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005594 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005595 if args:
5596 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005597
Edward Lemur934836a2019-09-09 20:16:54 +00005598 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005599 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005600 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005601 if not issue:
5602 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005603
Gavin Makbe2e9262022-11-08 23:41:55 +00005604 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005605 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005606 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005607 if not base:
5608 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5609 revision_info = detail['revisions'][detail['current_revision']]
5610 fetch_info = revision_info['fetch']['http']
5611 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5612 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005613
Aaron Gablea718c3e2017-08-28 17:47:28 -07005614 cmd = ['git', 'diff']
5615 if options.stat:
5616 cmd.append('--stat')
5617 cmd.append(base)
5618 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005619
5620 return 0
5621
5622
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005623@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005624def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005625 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005626 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005627 '--ignore-current',
5628 action='store_true',
5629 help='Ignore the CL\'s current reviewers and start from scratch.')
5630 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005631 '--ignore-self',
5632 action='store_true',
5633 help='Do not consider CL\'s author as an owners.')
5634 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005635 '--no-color',
5636 action='store_true',
5637 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005638 parser.add_option(
5639 '--batch',
5640 action='store_true',
5641 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005642 # TODO: Consider moving this to another command, since other
5643 # git-cl owners commands deal with owners for a given CL.
5644 parser.add_option(
5645 '--show-all',
5646 action='store_true',
5647 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005648 options, args = parser.parse_args(args)
5649
Edward Lemur934836a2019-09-09 20:16:54 +00005650 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005651 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005652
Yang Guo6e269a02019-06-26 11:17:02 +00005653 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005654 if len(args) == 0:
5655 print('No files specified for --show-all. Nothing to do.')
5656 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005657 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005658 for path in args:
5659 print('Owners for %s:' % path)
5660 print('\n'.join(
5661 ' - %s' % owner
5662 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005663 return 0
5664
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005665 if args:
5666 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005667 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005668 base_branch = args[0]
5669 else:
5670 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005671 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005672
Edward Lemur2c62b332020-03-12 22:12:33 +00005673 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005674
5675 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005676 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5677 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005678 return 0
5679
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005680 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005681 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005682 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005683 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005684 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005685 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005686 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005687
5688
Aiden Bennerc08566e2018-10-03 17:52:42 +00005689def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005690 """Generates a diff command."""
5691 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005692 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5693
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005694 if allow_prefix:
5695 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5696 # case that diff.noprefix is set in the user's git config.
5697 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5698 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005699 diff_cmd += ['--no-prefix']
5700
5701 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005702
5703 if args:
5704 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005705 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005706 diff_cmd.append(arg)
5707 else:
5708 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005709
5710 return diff_cmd
5711
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005712
Jamie Madill5e96ad12020-01-13 16:08:35 +00005713def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5714 """Runs clang-format-diff and sets a return value if necessary."""
5715
5716 if not clang_diff_files:
5717 return 0
5718
5719 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5720 # formatted. This is used to block during the presubmit.
5721 return_value = 0
5722
5723 # Locate the clang-format binary in the checkout
5724 try:
5725 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5726 except clang_format.NotFoundError as e:
5727 DieWithError(e)
5728
5729 if opts.full or settings.GetFormatFullByDefault():
5730 cmd = [clang_format_tool]
5731 if not opts.dry_run and not opts.diff:
5732 cmd.append('-i')
5733 if opts.dry_run:
5734 for diff_file in clang_diff_files:
5735 with open(diff_file, 'r') as myfile:
5736 code = myfile.read().replace('\r\n', '\n')
5737 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5738 stdout = stdout.replace('\r\n', '\n')
5739 if opts.diff:
5740 sys.stdout.write(stdout)
5741 if code != stdout:
5742 return_value = 2
5743 else:
5744 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5745 if opts.diff:
5746 sys.stdout.write(stdout)
5747 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005748 try:
5749 script = clang_format.FindClangFormatScriptInChromiumTree(
5750 'clang-format-diff.py')
5751 except clang_format.NotFoundError as e:
5752 DieWithError(e)
5753
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005754 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005755 if not opts.dry_run and not opts.diff:
5756 cmd.append('-i')
5757
5758 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005759 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005760
Edward Lesmes89624cd2020-04-06 17:51:56 +00005761 env = os.environ.copy()
5762 env['PATH'] = (
5763 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5764 stdout = RunCommand(
5765 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005766 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005767 if opts.diff:
5768 sys.stdout.write(stdout)
5769 if opts.dry_run and len(stdout) > 0:
5770 return_value = 2
5771
5772 return return_value
5773
5774
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005775def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5776 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5777 presubmit checks have failed (and returns 0 otherwise)."""
5778
5779 if not rust_diff_files:
5780 return 0
5781
5782 # Locate the rustfmt binary.
5783 try:
5784 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5785 except rustfmt.NotFoundError as e:
5786 DieWithError(e)
5787
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005788 # TODO(crbug.com/1440869): Support formatting only the changed lines
5789 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005790 cmd = [rustfmt_tool]
5791 if opts.dry_run:
5792 cmd.append('--check')
5793 cmd += rust_diff_files
5794 rustfmt_exitcode = subprocess2.call(cmd)
5795
5796 if opts.presubmit and rustfmt_exitcode != 0:
5797 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005798
5799 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005800
5801
Olivier Robin0a6b5442022-04-07 07:25:04 +00005802def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5803 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5804 that presubmit checks have failed (and returns 0 otherwise)."""
5805
5806 if not swift_diff_files:
5807 return 0
5808
5809 # Locate the swift-format binary.
5810 try:
5811 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5812 except swift_format.NotFoundError as e:
5813 DieWithError(e)
5814
5815 cmd = [swift_format_tool]
5816 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005817 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005818 else:
5819 cmd += ['format', '-i']
5820 cmd += swift_diff_files
5821 swift_format_exitcode = subprocess2.call(cmd)
5822
5823 if opts.presubmit and swift_format_exitcode != 0:
5824 return 2
5825
5826 return 0
5827
5828
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005829def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005830 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005831 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005832
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005833
enne@chromium.org555cfe42014-01-29 18:21:39 +00005834@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005835@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005836def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005837 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005838 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005839 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005840 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005841 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005842 parser.add_option('--full', action='store_true',
5843 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005844 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005845 parser.add_option('--dry-run', action='store_true',
5846 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005847 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005848 '--no-clang-format',
5849 dest='clang_format',
5850 action='store_false',
5851 default=True,
5852 help='Disables formatting of various file types using clang-format.')
5853 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005854 '--python',
5855 action='store_true',
5856 default=None,
5857 help='Enables python formatting on all python files.')
5858 parser.add_option(
5859 '--no-python',
5860 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005861 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005862 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005863 'If neither --python or --no-python are set, python files that have a '
5864 '.style.yapf file in an ancestor directory will be formatted. '
5865 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005866 parser.add_option(
5867 '--js',
5868 action='store_true',
5869 help='Format javascript code with clang-format. '
5870 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005871 parser.add_option('--diff', action='store_true',
5872 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005873 parser.add_option('--presubmit', action='store_true',
5874 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005875
5876 parser.add_option('--rust-fmt',
5877 dest='use_rust_fmt',
5878 action='store_true',
5879 default=rustfmt.IsRustfmtSupported(),
5880 help='Enables formatting of Rust file types using rustfmt.')
5881 parser.add_option(
5882 '--no-rust-fmt',
5883 dest='use_rust_fmt',
5884 action='store_false',
5885 help='Disables formatting of Rust file types using rustfmt.')
5886
Olivier Robin0a6b5442022-04-07 07:25:04 +00005887 parser.add_option(
5888 '--swift-format',
5889 dest='use_swift_format',
5890 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005891 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005892 help='Enables formatting of Swift file types using swift-format '
5893 '(macOS host only).')
5894 parser.add_option(
5895 '--no-swift-format',
5896 dest='use_swift_format',
5897 action='store_false',
5898 help='Disables formatting of Swift file types using swift-format.')
5899
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005900 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005901
Garrett Beaty91a6f332020-01-06 16:57:24 +00005902 if opts.python is not None and opts.no_python:
5903 raise parser.error('Cannot set both --python and --no-python')
5904 if opts.no_python:
5905 opts.python = False
5906
Daniel Chengc55eecf2016-12-30 03:11:02 -08005907 # Normalize any remaining args against the current path, so paths relative to
5908 # the current directory are still resolved as expected.
5909 args = [os.path.join(os.getcwd(), arg) for arg in args]
5910
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005911 # git diff generates paths against the root of the repository. Change
5912 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005913 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005914 if rel_base_path:
5915 os.chdir(rel_base_path)
5916
digit@chromium.org29e47272013-05-17 17:01:46 +00005917 # Grab the merge-base commit, i.e. the upstream commit of the current
5918 # branch when it was created or the last time it was rebased. This is
5919 # to cover the case where the user may have called "git fetch origin",
5920 # moving the origin branch to a newer commit, but hasn't rebased yet.
5921 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005922 upstream_branch = opts.upstream
5923 if not upstream_branch:
5924 cl = Changelist()
5925 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005926 if upstream_branch:
5927 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5928 upstream_commit = upstream_commit.strip()
5929
5930 if not upstream_commit:
5931 DieWithError('Could not find base commit for this branch. '
5932 'Are you in detached state?')
5933
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005934 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5935 diff_output = RunGit(changed_files_cmd)
5936 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005937 # Filter out files deleted by this CL
5938 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005939
Andreas Haas417d89c2020-02-06 10:24:27 +00005940 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005941 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005942
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005943 clang_diff_files = []
5944 if opts.clang_format:
5945 clang_diff_files = [
5946 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5947 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005948 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005949 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005950 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005951 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005952
Edward Lesmes50da7702020-03-30 19:23:43 +00005953 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005954
Jamie Madill5e96ad12020-01-13 16:08:35 +00005955 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5956 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005957
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005958 if opts.use_rust_fmt:
5959 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5960 upstream_commit)
5961 if rust_fmt_return_value == 2:
5962 return_value = 2
5963
Olivier Robin0a6b5442022-04-07 07:25:04 +00005964 if opts.use_swift_format:
5965 if sys.platform != 'darwin':
5966 DieWithError('swift-format is only supported on macOS.')
5967 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5968 upstream_commit)
5969 if swift_format_return_value == 2:
5970 return_value = 2
5971
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005972 # Similar code to above, but using yapf on .py files rather than clang-format
5973 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005974 py_explicitly_disabled = opts.python is not None and not opts.python
5975 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005976 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5977 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005978
Aiden Bennerc08566e2018-10-03 17:52:42 +00005979 # Used for caching.
5980 yapf_configs = {}
5981 for f in python_diff_files:
5982 # Find the yapf style config for the current file, defaults to depot
5983 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005984 _FindYapfConfigFile(f, yapf_configs, top_dir)
5985
5986 # Turn on python formatting by default if a yapf config is specified.
5987 # This breaks in the case of this repo though since the specified
5988 # style file is also the global default.
5989 if opts.python is None:
5990 filtered_py_files = []
5991 for f in python_diff_files:
5992 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5993 filtered_py_files.append(f)
5994 else:
5995 filtered_py_files = python_diff_files
5996
5997 # Note: yapf still seems to fix indentation of the entire file
5998 # even if line ranges are specified.
5999 # See https://github.com/google/yapf/issues/499
6000 if not opts.full and filtered_py_files:
6001 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6002
Brian Sheedyb4307d52019-12-02 19:18:17 +00006003 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6004 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6005 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006006
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006007 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006008 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6009 # Default to pep8 if not .style.yapf is found.
6010 if not yapf_style:
6011 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006012
Peter Wend9399922020-06-17 17:33:49 +00006013 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006014 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006015 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006016 else:
6017 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006018
6019 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006020
6021 has_formattable_lines = False
6022 if not opts.full:
6023 # Only run yapf over changed line ranges.
6024 for diff_start, diff_len in py_line_diffs[f]:
6025 diff_end = diff_start + diff_len - 1
6026 # Yapf errors out if diff_end < diff_start but this
6027 # is a valid line range diff for a removal.
6028 if diff_end >= diff_start:
6029 has_formattable_lines = True
6030 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6031 # If all line diffs were removals we have nothing to format.
6032 if not has_formattable_lines:
6033 continue
6034
6035 if opts.diff or opts.dry_run:
6036 cmd += ['--diff']
6037 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006038 stdout = RunCommand(cmd,
6039 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006040 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006041 cwd=top_dir,
6042 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006043 if opts.diff:
6044 sys.stdout.write(stdout)
6045 elif len(stdout) > 0:
6046 return_value = 2
6047 else:
6048 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006049 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006050
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006051 # Format GN build files. Always run on full build files for canonical form.
6052 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006053 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006054 if opts.dry_run or opts.diff:
6055 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006056 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006057 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006058 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006059 cwd=top_dir)
6060 if opts.dry_run and gn_ret == 2:
6061 return_value = 2 # Not formatted.
6062 elif opts.diff and gn_ret == 2:
6063 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006064 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006065 elif gn_ret != 0:
6066 # For non-dry run cases (and non-2 return values for dry-run), a
6067 # nonzero error code indicates a failure, probably because the file
6068 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006069 DieWithError('gn format failed on ' + gn_diff_file +
6070 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006071
Ilya Shermane081cbe2017-08-15 17:51:04 -07006072 # Skip the metrics formatting from the global presubmit hook. These files have
6073 # a separate presubmit hook that issues an error if the files need formatting,
6074 # whereas the top-level presubmit script merely issues a warning. Formatting
6075 # these files is somewhat slow, so it's important not to duplicate the work.
6076 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006077 for diff_xml in GetDiffXMLs(diff_files):
6078 xml_dir = GetMetricsDir(diff_xml)
6079 if not xml_dir:
6080 continue
6081
Ilya Shermane081cbe2017-08-15 17:51:04 -07006082 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006083 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006084 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006085
6086 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6087 # command as histograms/pretty_print.py now needs a relative path argument
6088 # after splitting the histograms into multiple directories.
6089 # For example, in tools/metrics/ukm, pretty-print could be run using:
6090 # $ python pretty_print.py
6091 # But in tools/metrics/histogrmas, pretty-print should be run with an
6092 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006093 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006094 # $ python pretty_print.py enums.xml
6095
Alexei Svitkined40cda52023-08-29 21:24:41 +00006096 if xml_dir == os.path.join('tools', 'metrics', 'histograms'):
6097 if os.path.basename(diff_xml) not in ('histograms.xml', 'enums.xml',
6098 'histogram_suffixes_list.xml'):
6099 # Skip this XML file if it's not one of the known types.
6100 continue
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006101 cmd.append(diff_xml)
6102
Ilya Shermane081cbe2017-08-15 17:51:04 -07006103 if opts.dry_run or opts.diff:
6104 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006105
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006106 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6107 # `shell` param and instead replace `'vpython'` with
6108 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006109 stdout = RunCommand(cmd,
6110 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006111 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006112 if opts.diff:
6113 sys.stdout.write(stdout)
6114 if opts.dry_run and stdout:
6115 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006116
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006117 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006119
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006120def GetDiffXMLs(diff_files):
6121 return [
6122 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6123 ]
6124
6125
6126def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006127 metrics_xml_dirs = [
6128 os.path.join('tools', 'metrics', 'actions'),
6129 os.path.join('tools', 'metrics', 'histograms'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006130 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006131 os.path.join('tools', 'metrics', 'ukm'),
6132 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006133 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006134 if diff_xml.startswith(xml_dir):
6135 return xml_dir
6136 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006137
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006138
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006139@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006140@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006141def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006142 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006143 _, args = parser.parse_args(args)
6144
6145 if len(args) != 1:
6146 parser.print_help()
6147 return 1
6148
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006149 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006150 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006151 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006152
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006153 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006154
Edward Lemur52969c92020-02-06 18:15:28 +00006155 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006156 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006157 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006158
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006159 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006160 for key, issue in [x.split() for x in output.splitlines()]:
6161 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006162 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006163
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006164 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006165 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006166 return 1
6167 if len(branches) == 1:
6168 RunGit(['checkout', branches[0]])
6169 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006170 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006171 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006172 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006173 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006174 try:
6175 RunGit(['checkout', branches[int(which)]])
6176 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006177 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006178 return 1
6179
6180 return 0
6181
6182
maruel@chromium.org29404b52014-09-08 22:58:00 +00006183def CMDlol(parser, args):
6184 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006185 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006186 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6187 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6188 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006189 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006190 return 0
6191
6192
Josip Sokcevic0399e172022-03-21 23:11:51 +00006193def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006194 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006195 print(utils.depot_tools_version())
6196
6197
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006198class OptionParser(optparse.OptionParser):
6199 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006200
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006201 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006202 optparse.OptionParser.__init__(
6203 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006204 self.add_option(
6205 '-v', '--verbose', action='count', default=0,
6206 help='Use 2 times for more debugging info')
6207
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006208 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006209 try:
6210 return self._parse_args(args)
6211 finally:
6212 # Regardless of success or failure of args parsing, we want to report
6213 # metrics, but only after logging has been initialized (if parsing
6214 # succeeded).
6215 global settings
6216 settings = Settings()
6217
Edward Lesmes9c349062021-05-06 20:02:39 +00006218 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006219 try:
6220 # GetViewVCUrl ultimately calls logging method.
6221 project_url = settings.GetViewVCUrl().strip('/+')
6222 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6223 metrics.collector.add('project_urls', [project_url])
6224 except subprocess2.CalledProcessError:
6225 # Occurs when command is not executed in a git repository
6226 # We should not fail here. If the command needs to be executed
6227 # in a repo, it will be raised later.
6228 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006229
6230 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006231 # Create an optparse.Values object that will store only the actual passed
6232 # options, without the defaults.
6233 actual_options = optparse.Values()
6234 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6235 # Create an optparse.Values object with the default options.
6236 options = optparse.Values(self.get_default_values().__dict__)
6237 # Update it with the options passed by the user.
6238 options._update_careful(actual_options.__dict__)
6239 # Store the options passed by the user in an _actual_options attribute.
6240 # We store only the keys, and not the values, since the values can contain
6241 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006242 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006243
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006244 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006245 logging.basicConfig(
6246 level=levels[min(options.verbose, len(levels) - 1)],
6247 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6248 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006249
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006250 return options, args
6251
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006252
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006253def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006254 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006255 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006256 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006257 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006258
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006259 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006260 dispatcher = subcommand.CommandDispatcher(__name__)
6261 try:
6262 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006263 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006264 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006265 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006266 if e.code != 500:
6267 raise
6268 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006269 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006270 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006271 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006272
6273
6274if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006275 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6276 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006277 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006278 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006279 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006280 sys.exit(main(sys.argv[1:]))