blob: 95a70f3d441092aa92195a6e85e7c68caf8b8d4d [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 Wanga1abbed2023-01-24 01:41:05 +00001574
1575 # TODO(tandrii): options.message should be posted as a comment if
1576 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1577 # to do it.
1578
1579 # Set options.title in case user was prompted in _GetTitleForUpload and
1580 # _CMDUploadChange needs to be called again.
1581 options.title = self._GetTitleForUpload(
1582 options, multi_change_upload=multi_change_upload)
1583
1584 if options.title:
1585 # Punctuation and whitespace in |title| must be percent-encoded.
1586 refspec_opts.append('m=' +
1587 gerrit_util.PercentEncodeForGitRef(options.title))
1588
1589 if options.private:
1590 refspec_opts.append('private')
1591
1592 if options.topic:
1593 # Documentation on Gerrit topics is here:
1594 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1595 refspec_opts.append('topic=%s' % options.topic)
1596
1597 if options.enable_auto_submit:
1598 refspec_opts.append('l=Auto-Submit+1')
1599 if options.set_bot_commit:
1600 refspec_opts.append('l=Bot-Commit+1')
1601 if options.use_commit_queue:
1602 refspec_opts.append('l=Commit-Queue+2')
1603 elif options.cq_dry_run:
1604 refspec_opts.append('l=Commit-Queue+1')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001605
1606 if change_desc.get_reviewers(tbr_only=True):
1607 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1608 self.GetGerritProject())
1609 refspec_opts.append('l=Code-Review+%s' % score)
1610
Joanna Wang40497912023-01-24 21:18:16 +00001611 # Gerrit sorts hashtags, so order is not important.
1612 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1613 # We check GetIssue because we only add hashtags from the
1614 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001615 # TODO(b/265929888): When we fully launch the new path:
1616 # 1) remove fetching hashtags from description alltogether
1617 # 2) Or use descrtiption hashtags for:
1618 # `not (self.GetIssue() and multi_change_upload)`
1619 # 3) Or enabled change description tags for multi and single changes
1620 # by adding them post `git push`.
1621 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001622 hashtags.update(change_desc.get_hash_tags())
1623 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001624
1625 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001626 # branch/change.
1627 return refspec_opts
1628
Joanna Wang05b60342023-03-29 20:25:57 +00001629 def PrepareSquashedCommit(self,
1630 options,
1631 parent,
1632 orig_parent,
1633 end_commit=None):
1634 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1635 """Create a squashed commit to upload.
1636
1637
1638 Args:
1639 parent: The commit to use as the parent for the new squashed.
1640 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1641 is part of the same original tree as end_commit, which does not
1642 contain squashed commits. This is used to create the change
1643 description for the new squashed commit with:
1644 `git log orig_parent..end_commit`.
1645 end_commit: The commit to use as the end of the new squashed commit.
1646 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001647
1648 if end_commit is None:
1649 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1650
Joanna Wang05b60342023-03-29 20:25:57 +00001651 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001652 end_commit)
1653 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1654 with gclient_utils.temporary_file() as desc_tempfile:
1655 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1656 commit_to_push = RunGit(
1657 ['commit-tree', latest_tree, '-p', parent, '-F',
1658 desc_tempfile]).strip()
1659
Joanna Wang7603f042023-03-01 22:17:36 +00001660 # Gerrit may or may not update fast enough to return the correct patchset
1661 # number after we push. Get the pre-upload patchset and increment later.
1662 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001663 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001664 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001665
Joanna Wang6215dd02023-02-07 15:58:03 +00001666 def PrepareCherryPickSquashedCommit(self, options, parent):
1667 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001668 """Create a commit cherry-picked on parent to push."""
1669
Joanna Wang6215dd02023-02-07 15:58:03 +00001670 # The `parent` is what we will cherry-pick on top of.
1671 # The `cherry_pick_base` is the beginning range of what
1672 # we are cherry-picking.
1673 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1674 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001675 self.branchref)
1676
1677 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1678 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1679 with gclient_utils.temporary_file() as desc_tempfile:
1680 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001681 commit_to_cp = RunGit([
1682 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1683 desc_tempfile
1684 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001685
Joanna Wang6215dd02023-02-07 15:58:03 +00001686 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001687 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1688 if ret:
1689 RunGit(['cherry-pick', '--abort'])
1690 RunGit(['checkout', '-q', self.branch])
1691 DieWithError('Could not cleanly cherry-pick')
1692
Joanna Wang6215dd02023-02-07 15:58:03 +00001693 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001694 RunGit(['checkout', '-q', self.branch])
1695
Joanna Wang7603f042023-03-01 22:17:36 +00001696 # Gerrit may or may not update fast enough to return the correct patchset
1697 # number after we push. Get the pre-upload patchset and increment later.
1698 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001699 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001700 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001701
Joanna Wangb46232e2023-01-21 01:58:46 +00001702 def _PrepareChange(self, options, parent, end_commit):
1703 # type: (optparse.Values, str, str) ->
1704 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1705 """Prepares the change to be uploaded."""
1706 self.EnsureCanUploadPatchset(options.force)
1707
1708 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1709 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1710 files)
1711
1712 watchlist = watchlists.Watchlists(settings.GetRoot())
1713 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1714 if not options.bypass_hooks:
1715 hook_results = self.RunHook(committing=False,
1716 may_prompt=not options.force,
1717 verbose=options.verbose,
1718 parallel=options.parallel,
1719 upstream=parent,
1720 description=change_desc.description,
1721 all_files=False)
1722 self.ExtendCC(hook_results['more_cc'])
1723
1724 # Update the change description and ensure we have a Change Id.
1725 if self.GetIssue():
1726 if options.edit_description:
1727 change_desc.prompt()
1728 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1729 change_id = change_detail['change_id']
1730 change_desc.ensure_change_id(change_id)
1731
Joanna Wangb46232e2023-01-21 01:58:46 +00001732 else: # No change issue. First time uploading
1733 if not options.force and not options.message_file:
1734 change_desc.prompt()
1735
1736 # Check if user added a change_id in the descripiton.
1737 change_ids = git_footers.get_footer_change_id(change_desc.description)
1738 if len(change_ids) == 1:
1739 change_id = change_ids[0]
1740 else:
1741 change_id = GenerateGerritChangeId(change_desc.description)
1742 change_desc.ensure_change_id(change_id)
1743
1744 if options.preserve_tryjobs:
1745 change_desc.set_preserve_tryjobs()
1746
1747 SaveDescriptionBackup(change_desc)
1748
1749 # Add ccs
1750 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001751 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001752 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001753 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001754 ccs = self.GetCCList().split(',')
1755 if len(ccs) > 100:
1756 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1757 'process/lsc/lsc_workflow.md')
1758 print('WARNING: This will auto-CC %s users.' % len(ccs))
1759 print('LSC may be more appropriate: %s' % lsc)
1760 print('You can also use the --no-autocc flag to disable auto-CC.')
1761 confirm_or_exit(action='continue')
1762
1763 # Add ccs from the --cc flag.
1764 if options.cc:
1765 ccs.extend(options.cc)
1766
1767 ccs = [email.strip() for email in ccs if email.strip()]
1768 if change_desc.get_cced():
1769 ccs.extend(change_desc.get_cced())
1770
1771 return change_desc.get_reviewers(), ccs, change_desc
1772
Joanna Wang40497912023-01-24 21:18:16 +00001773 def PostUploadUpdates(self, options, new_upload, change_number):
1774 # type: (optparse.Values, _NewUpload, change_number) -> None
1775 """Makes necessary post upload changes to the local and remote cl."""
1776 if not self.GetIssue():
1777 self.SetIssue(change_number)
1778
Joanna Wang7603f042023-03-01 22:17:36 +00001779 self.SetPatchset(new_upload.prev_patchset + 1)
1780
Joanna Wang40497912023-01-24 21:18:16 +00001781 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1782 new_upload.commit_to_push)
1783 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1784 new_upload.new_last_uploaded_commit)
1785
1786 if settings.GetRunPostUploadHook():
1787 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001788 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00001789
1790 if new_upload.reviewers or new_upload.ccs:
1791 gerrit_util.AddReviewers(self.GetGerritHost(),
1792 self._GerritChangeIdentifier(),
1793 reviewers=new_upload.reviewers,
1794 ccs=new_upload.ccs,
1795 notify=bool(options.send_mail))
1796
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001797 def CMDUpload(self, options, git_diff_args, orig_args):
1798 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001799 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001800 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001801 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001802 else:
1803 if self.GetBranch() is None:
1804 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1805
1806 # Default to diffing against common ancestor of upstream branch
1807 base_branch = self.GetCommonAncestorWithUpstream()
1808 git_diff_args = [base_branch, 'HEAD']
1809
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001810 # Fast best-effort checks to abort before running potentially expensive
1811 # hooks if uploading is likely to fail anyway. Passing these checks does
1812 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001813 self.EnsureAuthenticated(force=options.force)
1814 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001815
1816 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001817 watchlist = watchlists.Watchlists(settings.GetRoot())
1818 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001819 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001820 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001821
Edward Lemur5a644f82020-03-18 16:44:57 +00001822 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001823 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001824 hook_results = self.RunHook(committing=False,
1825 may_prompt=not options.force,
1826 verbose=options.verbose,
1827 parallel=options.parallel,
1828 upstream=base_branch,
1829 description=change_desc.description,
1830 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001831 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832
Aaron Gable13101a62018-02-09 13:20:41 -08001833 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001834 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001835 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001836 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001837 if self.GetBranch() is not None:
1838 self._GitSetBranchConfigValue(
1839 LAST_UPLOAD_HASH_CONFIG_KEY,
1840 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001841 # Run post upload hooks, if specified.
1842 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001843 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001844 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845
1846 # Upload all dependencies if specified.
1847 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001848 print()
1849 print('--dependencies has been specified.')
1850 print('All dependent local branches will be re-uploaded.')
1851 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001852 # Remove the dependencies flag from args so that we do not end up in a
1853 # loop.
1854 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001855 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001856 return ret
1857
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001858 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001859 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001860
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001861 Issue must have been already uploaded and known.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001862 """
1863 assert new_state in _CQState.ALL_STATES
1864 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001865 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001866 vote_map = {
1867 _CQState.NONE: 0,
1868 _CQState.DRY_RUN: 1,
1869 _CQState.COMMIT: 2,
1870 }
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001871 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001872 notify = False if new_state == _CQState.DRY_RUN else None
1873 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001874 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001875 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001876 return 0
1877 except KeyboardInterrupt:
1878 raise
1879 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001880 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001881 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001882 ' * Your project has no CQ,\n'
1883 ' * You don\'t have permission to change the CQ state,\n'
1884 ' * There\'s a bug in this code (see stack trace below).\n'
1885 'Consider specifying which bots to trigger manually or asking your '
1886 'project owners for permissions or contacting Chrome Infra at:\n'
1887 'https://www.chromium.org/infra\n\n' %
1888 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001889 # Still raise exception so that stack trace is printed.
1890 raise
1891
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001892 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001893 # Lazy load of configs.
1894 self.GetCodereviewServer()
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001895
tandriie32e3ea2016-06-22 02:52:48 -07001896 if self._gerrit_host and '.' not in self._gerrit_host:
1897 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
Edward Lemur79d4f992019-11-11 23:49:02 +00001898 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001899 if parsed.scheme == 'sso':
tandriie32e3ea2016-06-22 02:52:48 -07001900 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1901 self._gerrit_server = 'https://%s' % self._gerrit_host
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001902
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903 return self._gerrit_host
1904
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001905 def _GetGitHost(self):
1906 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001907 remote_url = self.GetRemoteUrl()
1908 if not remote_url:
1909 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001910 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001911
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001912 def GetCodereviewServer(self):
1913 if not self._gerrit_server:
1914 # If we're on a branch then get the server potentially associated
1915 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001916 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001917 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001918 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001919 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001920 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 if not self._gerrit_server:
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001922 url = urllib.parse.urlparse(self.GetRemoteUrl())
1923 parts = url.netloc.split('.')
1924
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1926 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001927 parts[0] = parts[0] + '-review'
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001928
1929 if url.scheme == 'sso' and len(parts) == 1:
1930 # sso:// uses abbreivated hosts, eg. sso://chromium instead of
1931 # chromium.googlesource.com. Hence, for code review server, they need
1932 # to be expanded.
1933 parts[0] += '.googlesource.com'
1934
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001935 self._gerrit_host = '.'.join(parts)
1936 self._gerrit_server = 'https://%s' % self._gerrit_host
1937 return self._gerrit_server
1938
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001939 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001940 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001941 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001942 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001943 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001944 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001945 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001946 if project.endswith('.git'):
1947 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001948 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1949 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1950 # gitiles/git-over-https protocol. E.g.,
1951 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1952 # as
1953 # https://chromium.googlesource.com/v8/v8
1954 if project.startswith('a/'):
1955 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001956 return project
1957
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001958 def _GerritChangeIdentifier(self):
1959 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1960
1961 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001962 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001963 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001964 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001965 if project:
1966 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1967 # Fall back on still unique, but less efficient change number.
1968 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001969
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001970 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001971 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001972 if settings.GetGerritSkipEnsureAuthenticated():
1973 # For projects with unusual authentication schemes.
1974 # See http://crbug.com/603378.
1975 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001976
1977 # Check presence of cookies only if using cookies-based auth method.
1978 cookie_auth = gerrit_util.Authenticator.get()
1979 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001980 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001981
Florian Mayerae510e82020-01-30 21:04:48 +00001982 remote_url = self.GetRemoteUrl()
1983 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001984 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001985 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001986 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1987 logging.warning(
1988 'Ignoring branch %(branch)s with non-https/sso remote '
1989 '%(remote)s', {
1990 'branch': self.branch,
1991 'remote': self.GetRemoteUrl()
1992 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001993 return
1994
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001995 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001996 self.GetCodereviewServer()
1997 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001998 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001999
2000 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2001 git_auth = cookie_auth.get_auth_header(git_host)
2002 if gerrit_auth and git_auth:
2003 if gerrit_auth == git_auth:
2004 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002005 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002006 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002007 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002008 ' %s\n'
2009 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002010 ' Consider running the following command:\n'
2011 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002012 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002013 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002014 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002015 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002016 cookie_auth.get_new_password_message(git_host)))
2017 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002018 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002019 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002020
2021 missing = (
2022 ([] if gerrit_auth else [self._gerrit_host]) +
2023 ([] if git_auth else [git_host]))
2024 DieWithError('Credentials for the following hosts are required:\n'
2025 ' %s\n'
2026 'These are read from %s (or legacy %s)\n'
2027 '%s' % (
2028 '\n '.join(missing),
2029 cookie_auth.get_gitcookies_path(),
2030 cookie_auth.get_netrc_path(),
2031 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002033 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002034 if not self.GetIssue():
2035 return
2036
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002037 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002038 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002039 DieWithError(
2040 'Change %s has been abandoned, new uploads are not allowed' %
2041 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002042 if status == 'MERGED':
2043 answer = gclient_utils.AskForData(
2044 'Change %s has been submitted, new uploads are not allowed. '
2045 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2046 ).lower()
2047 if answer not in ('y', ''):
2048 DieWithError('New uploads are not allowed.')
2049 self.SetIssue()
2050 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002051
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002052 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2053 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2054 # Apparently this check is not very important? Otherwise get_auth_email
2055 # could have been added to other implementations of Authenticator.
2056 cookies_auth = gerrit_util.Authenticator.get()
2057 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002058 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002059
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002060 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002061 if self.GetIssueOwner() == cookies_user:
2062 return
2063 logging.debug('change %s owner is %s, cookies user is %s',
2064 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002065 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002066 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002067 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002068 if details['email'] == self.GetIssueOwner():
2069 return
2070 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002071 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002072 'as %s.\n'
2073 'Uploading may fail due to lack of permissions.' %
2074 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2075 confirm_or_exit(action='upload')
2076
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002077 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002078 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002079 or CQ status, assuming adherence to a common workflow.
2080
2081 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002082 * 'error' - error from review tool (including deleted issues)
2083 * 'unsent' - no reviewers added
2084 * 'waiting' - waiting for review
2085 * 'reply' - waiting for uploader to reply to review
2086 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002087 * 'dry-run' - dry-running in the CQ
2088 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002089 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002090 """
2091 if not self.GetIssue():
2092 return None
2093
2094 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002095 data = self._GetChangeDetail([
2096 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002097 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002098 return 'error'
2099
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002100 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002101 return 'closed'
2102
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002103 cq_label = data['labels'].get('Commit-Queue', {})
2104 max_cq_vote = 0
2105 for vote in cq_label.get('all', []):
2106 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2107 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002108 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002109 if max_cq_vote == 1:
2110 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002111
Aaron Gable9ab38c62017-04-06 14:36:33 -07002112 if data['labels'].get('Code-Review', {}).get('approved'):
2113 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002114
2115 if not data.get('reviewers', {}).get('REVIEWER', []):
2116 return 'unsent'
2117
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002118 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002119 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002120 while messages:
2121 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002122 if (m.get('tag', '').startswith('autogenerated:cq') or
2123 m.get('tag', '').startswith('autogenerated:cv')):
2124 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002125 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002126 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002127 # Most recent message was by owner.
2128 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002129
2130 # Some reply from non-owner.
2131 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002132
2133 # Somehow there are no messages even though there are reviewers.
2134 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002135
Gavin Mak4e5e3992022-11-14 22:40:12 +00002136 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002137 if not self.GetIssue():
2138 return None
2139
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002140 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002141 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002142 if update:
2143 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002144 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002145
Gavin Makf35a9eb2022-11-17 18:34:36 +00002146 def _IsPatchsetRangeSignificant(self, lower, upper):
2147 """Returns True if the inclusive range of patchsets contains any reworks or
2148 rebases."""
2149 if not self.GetIssue():
2150 return False
2151
2152 data = self._GetChangeDetail(['ALL_REVISIONS'])
2153 ps_kind = {}
2154 for rev_info in data.get('revisions', {}).values():
2155 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2156
2157 for ps in range(lower, upper + 1):
2158 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2159 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2160 return True
2161 return False
2162
Gavin Make61ccc52020-11-13 00:12:57 +00002163 def GetMostRecentDryRunPatchset(self):
2164 """Get patchsets equivalent to the most recent patchset and return
2165 the patchset with the latest dry run. If none have been dry run, return
2166 the latest patchset."""
2167 if not self.GetIssue():
2168 return None
2169
2170 data = self._GetChangeDetail(['ALL_REVISIONS'])
2171 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002172 dry_run = {int(m['_revision_number'])
2173 for m in data.get('messages', [])
2174 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002175
2176 for revision_info in sorted(data.get('revisions', {}).values(),
2177 key=lambda c: c['_number'], reverse=True):
2178 if revision_info['_number'] in dry_run:
2179 patchset = revision_info['_number']
2180 break
2181 if revision_info.get('kind', '') not in \
2182 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2183 break
2184 self.SetPatchset(patchset)
2185 return patchset
2186
Aaron Gable636b13f2017-07-14 10:42:48 -07002187 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002188 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002189 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002190 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002191
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002192 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002193 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002194 # CURRENT_REVISION is included to get the latest patchset so that
2195 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002196 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002197 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2198 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002199 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002200 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002201 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002202 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002203
2204 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002205 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002206 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002207 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002208 line_comments = file_comments.setdefault(path, [])
2209 line_comments.extend(
2210 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002211
2212 # Build dictionary of file comments for easy access and sorting later.
2213 # {author+date: {path: {patchset: {line: url+message}}}}
2214 comments = collections.defaultdict(
2215 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002216
2217 server = self.GetCodereviewServer()
2218 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2219 # /c/ is automatically added by short URL server.
2220 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2221 self.GetIssue())
2222 else:
2223 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2224
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002225 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002226 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002227 tag = comment.get('tag', '')
2228 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002229 continue
2230 key = (comment['author']['email'], comment['updated'])
2231 if comment.get('side', 'REVISION') == 'PARENT':
2232 patchset = 'Base'
2233 else:
2234 patchset = 'PS%d' % comment['patch_set']
2235 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002236 url = ('%s/%s/%s#%s%s' %
2237 (url_prefix, comment['patch_set'], path,
2238 'b' if comment.get('side') == 'PARENT' else '',
2239 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002240 comments[key][path][patchset][line] = (url, comment['message'])
2241
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002242 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002243 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244 summary = self._BuildCommentSummary(msg, comments, readable)
2245 if summary:
2246 summaries.append(summary)
2247 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002248
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002249 @staticmethod
2250 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002251 if 'email' not in msg['author']:
2252 # Some bot accounts may not have an email associated.
2253 return None
2254
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002255 key = (msg['author']['email'], msg['date'])
2256 # Don't bother showing autogenerated messages that don't have associated
2257 # file or line comments. this will filter out most autogenerated
2258 # messages, but will keep robot comments like those from Tricium.
2259 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2260 if is_autogenerated and not comments.get(key):
2261 return None
2262 message = msg['message']
2263 # Gerrit spits out nanoseconds.
2264 assert len(msg['date'].split('.')[-1]) == 9
2265 date = datetime.datetime.strptime(msg['date'][:-3],
2266 '%Y-%m-%d %H:%M:%S.%f')
2267 if key in comments:
2268 message += '\n'
2269 for path, patchsets in sorted(comments.get(key, {}).items()):
2270 if readable:
2271 message += '\n%s' % path
2272 for patchset, lines in sorted(patchsets.items()):
2273 for line, (url, content) in sorted(lines.items()):
2274 if line:
2275 line_str = 'Line %d' % line
2276 path_str = '%s:%d:' % (path, line)
2277 else:
2278 line_str = 'File comment'
2279 path_str = '%s:0:' % path
2280 if readable:
2281 message += '\n %s, %s: %s' % (patchset, line_str, url)
2282 message += '\n %s\n' % content
2283 else:
2284 message += '\n%s ' % path_str
2285 message += '\n%s\n' % content
2286
2287 return _CommentSummary(
2288 date=date,
2289 message=message,
2290 sender=msg['author']['email'],
2291 autogenerated=is_autogenerated,
2292 # These could be inferred from the text messages and correlated with
2293 # Code-Review label maximum, however this is not reliable.
2294 # Leaving as is until the need arises.
2295 approval=False,
2296 disapproval=False,
2297 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002298
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002299 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002300 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002301 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002302
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002303 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002304 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002305 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002306
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002307 def _GetChangeDetail(self, options=None):
2308 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002309 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002310 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002311
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002312 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002313 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002314 options.append('CURRENT_COMMIT')
2315
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002316 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002317 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002318 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002319
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002320 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2321 # Assumption: data fetched before with extra options is suitable
2322 # for return for a smaller set of options.
2323 # For example, if we cached data for
2324 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2325 # and request is for options=[CURRENT_REVISION],
2326 # THEN we can return prior cached data.
2327 if options_set.issubset(cached_options_set):
2328 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002329
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002330 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002331 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002332 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002333 except gerrit_util.GerritError as e:
2334 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002335 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002336 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002337
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002338 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002339 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002340
Gavin Mak4e5e3992022-11-14 22:40:12 +00002341 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002342 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002343 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002344 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2345 self._GerritChangeIdentifier(),
2346 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002347 except gerrit_util.GerritError as e:
2348 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002349 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002350 raise
agable32978d92016-11-01 12:55:02 -07002351 return data
2352
Karen Qian40c19422019-03-13 21:28:29 +00002353 def _IsCqConfigured(self):
2354 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002355 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002356
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002357 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002358 if git_common.is_dirty_git_tree('land'):
2359 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002360
tandriid60367b2016-06-22 05:25:12 -07002361 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002362 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002363 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002364 'which can test and land changes for you. '
2365 'Are you sure you wish to bypass it?\n',
2366 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002367 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002368 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002369 # Note: git diff outputs nothing if there is no diff.
2370 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002371 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002372 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002373 if detail['current_revision'] == last_upload:
2374 differs = False
2375 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002376 print('WARNING: Local branch contents differ from latest uploaded '
2377 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002378 if differs:
2379 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002380 confirm_or_exit(
2381 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2382 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002383 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002384 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002385 upstream = self.GetCommonAncestorWithUpstream()
2386 if self.GetIssue():
2387 description = self.FetchDescription()
2388 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002389 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002390 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002391 committing=True,
2392 may_prompt=not force,
2393 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002394 parallel=parallel,
2395 upstream=upstream,
2396 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002397 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002398 resultdb=resultdb,
2399 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002401 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002402 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002403 links = self._GetChangeCommit().get('web_links', [])
2404 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002405 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002406 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002407 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002408 return 0
2409
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002410 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2411 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002412 assert parsed_issue_arg.valid
2413
Edward Lemur125d60a2019-09-13 18:25:41 +00002414 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002415
2416 if parsed_issue_arg.hostname:
2417 self._gerrit_host = parsed_issue_arg.hostname
2418 self._gerrit_server = 'https://%s' % self._gerrit_host
2419
tandriic2405f52016-10-10 08:13:15 -07002420 try:
2421 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002422 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002423 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002424
2425 if not parsed_issue_arg.patchset:
2426 # Use current revision by default.
2427 revision_info = detail['revisions'][detail['current_revision']]
2428 patchset = int(revision_info['_number'])
2429 else:
2430 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002431 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002432 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2433 break
2434 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002435 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002436 (parsed_issue_arg.patchset, self.GetIssue()))
2437
Edward Lemur125d60a2019-09-13 18:25:41 +00002438 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002439 if remote_url.endswith('.git'):
2440 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002441 remote_url = remote_url.rstrip('/')
2442
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002443 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002444 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002445
2446 if remote_url != fetch_info['url']:
2447 DieWithError('Trying to patch a change from %s but this repo appears '
2448 'to be %s.' % (fetch_info['url'], remote_url))
2449
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002450 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002451
Joanna Wangc023a632023-01-26 17:59:25 +00002452 # Set issue immediately in case the cherry-pick fails, which happens
2453 # when resolving conflicts.
2454 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002455 self.SetIssue(parsed_issue_arg.issue)
2456
Aaron Gable62619a32017-06-16 08:22:09 -07002457 if force:
2458 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2459 print('Checked out commit for change %i patchset %i locally' %
2460 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002461 elif nocommit:
2462 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2463 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002464 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002465 RunGit(['cherry-pick', 'FETCH_HEAD'])
2466 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002467 (parsed_issue_arg.issue, patchset))
2468 print('Note: this created a local commit which does not have '
2469 'the same hash as the one uploaded for review. This will make '
2470 'uploading changes based on top of this branch difficult.\n'
2471 'If you want to do that, use "git cl patch --force" instead.')
2472
Stefan Zagerd08043c2017-10-12 12:07:02 -07002473 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002474 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002475 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002476 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2477 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002478 else:
2479 print('WARNING: You are in detached HEAD state.\n'
2480 'The patch has been applied to your checkout, but you will not be '
2481 'able to upload a new patch set to the gerrit issue.\n'
2482 'Try using the \'-b\' option if you would like to work on a '
2483 'branch and/or upload a new patch set.')
2484
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002485 return 0
2486
Joanna Wang18de1f62023-01-21 01:24:24 +00002487 @staticmethod
2488 def _GerritCommitMsgHookCheck(offer_removal):
2489 # type: (bool) -> None
2490 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002491 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2492 if not os.path.exists(hook):
2493 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002494 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2495 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002496 data = gclient_utils.FileRead(hook)
2497 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2498 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002499 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002500 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002501 'and may interfere with it in subtle ways.\n'
2502 'We recommend you remove the commit-msg hook.')
2503 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002504 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002505 gclient_utils.rm_file_or_tree(hook)
2506 print('Gerrit commit-msg hook removed.')
2507 else:
2508 print('OK, will keep Gerrit commit-msg hook in place.')
2509
Edward Lemur1b52d872019-05-09 21:12:12 +00002510 def _CleanUpOldTraces(self):
2511 """Keep only the last |MAX_TRACES| traces."""
2512 try:
2513 traces = sorted([
2514 os.path.join(TRACES_DIR, f)
2515 for f in os.listdir(TRACES_DIR)
2516 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2517 and not f.startswith('tmp'))
2518 ])
2519 traces_to_delete = traces[:-MAX_TRACES]
2520 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002521 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002522 except OSError:
2523 print('WARNING: Failed to remove old git traces from\n'
2524 ' %s'
2525 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002526
Edward Lemur5737f022019-05-17 01:24:00 +00002527 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002528 """Zip and write the git push traces stored in traces_dir."""
2529 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002530 traces_zip = trace_name + '-traces'
2531 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002532 # Create a temporary dir to store git config and gitcookies in. It will be
2533 # compressed and stored next to the traces.
2534 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002535 git_info_zip = trace_name + '-git-info'
2536
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002537 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002538
Edward Lemur1b52d872019-05-09 21:12:12 +00002539 git_push_metadata['trace_name'] = trace_name
2540 gclient_utils.FileWrite(
2541 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2542
2543 # Keep only the first 6 characters of the git hashes on the packet
2544 # trace. This greatly decreases size after compression.
2545 packet_traces = os.path.join(traces_dir, 'trace-packet')
2546 if os.path.isfile(packet_traces):
2547 contents = gclient_utils.FileRead(packet_traces)
2548 gclient_utils.FileWrite(
2549 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2550 shutil.make_archive(traces_zip, 'zip', traces_dir)
2551
2552 # Collect and compress the git config and gitcookies.
2553 git_config = RunGit(['config', '-l'])
2554 gclient_utils.FileWrite(
2555 os.path.join(git_info_dir, 'git-config'),
2556 git_config)
2557
2558 cookie_auth = gerrit_util.Authenticator.get()
2559 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2560 gitcookies_path = cookie_auth.get_gitcookies_path()
2561 if os.path.isfile(gitcookies_path):
2562 gitcookies = gclient_utils.FileRead(gitcookies_path)
2563 gclient_utils.FileWrite(
2564 os.path.join(git_info_dir, 'gitcookies'),
2565 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2566 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2567
Edward Lemur1b52d872019-05-09 21:12:12 +00002568 gclient_utils.rmtree(git_info_dir)
2569
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002570 def _RunGitPushWithTraces(self,
2571 refspec,
2572 refspec_opts,
2573 git_push_metadata,
2574 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002575 """Run git push and collect the traces resulting from the execution."""
2576 # Create a temporary directory to store traces in. Traces will be compressed
2577 # and stored in a 'traces' dir inside depot_tools.
2578 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002579 trace_name = os.path.join(
2580 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002581
2582 env = os.environ.copy()
2583 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2584 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002585 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002586 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2587 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2588 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2589
2590 try:
2591 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002592 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002593 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002594 push_cmd = ['git', 'push', remote_url, refspec]
2595 if git_push_options:
2596 for opt in git_push_options:
2597 push_cmd.extend(['-o', opt])
2598
Edward Lemur0f58ae42019-04-30 17:24:12 +00002599 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002600 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002601 env=env,
2602 print_stdout=True,
2603 # Flush after every line: useful for seeing progress when running as
2604 # recipe.
2605 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002606 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002607 except subprocess2.CalledProcessError as e:
2608 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002609 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002610 raise GitPushError(
2611 'Failed to create a change, very likely due to blocked keyword. '
2612 'Please examine output above for the reason of the failure.\n'
2613 'If this is a false positive, you can try to bypass blocked '
2614 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002615 '-o banned-words~skip, e.g.:\n'
2616 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002617 'If git-cl is not working correctly, file a bug under the '
2618 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002619 if 'git push -o nokeycheck' in str(e.stdout):
2620 raise GitPushError(
2621 'Failed to create a change, very likely due to a private key being '
2622 'detected. Please examine output above for the reason of the '
2623 'failure.\n'
2624 'If this is a false positive, you can try to bypass private key '
2625 'detection by using push option '
2626 '-o nokeycheck, e.g.:\n'
2627 'git cl upload -o nokeycheck\n\n'
2628 'If git-cl is not working correctly, file a bug under the '
2629 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002630
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002631 raise GitPushError(
2632 'Failed to create a change. Please examine output above for the '
2633 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002634 'For emergencies, Googlers can escalate to '
2635 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002636 'Hint: run command below to diagnose common Git/Gerrit '
2637 'credential problems:\n'
2638 ' git cl creds-check\n'
2639 '\n'
2640 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2641 'component including the files below.\n'
2642 'Review the files before upload, since they might contain sensitive '
2643 'information.\n'
2644 'Set the Restrict-View-Google label so that they are not publicly '
2645 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002646 finally:
2647 execution_time = time_time() - before_push
2648 metrics.collector.add_repeated('sub_commands', {
2649 'command': 'git push',
2650 'execution_time': execution_time,
2651 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002652 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002653 })
2654
Edward Lemur1b52d872019-05-09 21:12:12 +00002655 git_push_metadata['execution_time'] = execution_time
2656 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002657 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002658
Edward Lemur1b52d872019-05-09 21:12:12 +00002659 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002660 gclient_utils.rmtree(traces_dir)
2661
2662 return push_stdout
2663
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002664 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2665 change_desc):
2666 """Upload the current branch to Gerrit, retry if new remote HEAD is
2667 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002668 remote, remote_branch = self.GetRemoteBranch()
2669 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2670
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002671 try:
2672 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002673 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002674 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002675 # Repository might be in the middle of transition to main branch as
2676 # default, and uploads to old default might be blocked.
2677 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002678 DieWithError(str(e), change_desc)
2679
Josip Sokcevicb631a882021-01-06 18:18:10 +00002680 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2681 self.GetGerritProject())
2682 if project_head == branch:
2683 DieWithError(str(e), change_desc)
2684 branch = project_head
2685
2686 print("WARNING: Fetching remote state and retrying upload to default "
2687 "branch...")
2688 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002689 options.edit_description = False
2690 options.force = True
2691 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002692 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2693 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002694 except GitPushError as e:
2695 DieWithError(str(e), change_desc)
2696
2697 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002698 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002699 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002700 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002701 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002702 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002703 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002704 # User requested to change description
2705 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002706 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002707 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2708 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002709 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002710
2711 # Check if changes outside of this workspace have been uploaded.
2712 current_rev = change_detail['current_revision']
2713 last_uploaded_rev = self._GitGetBranchConfigValue(
2714 GERRIT_SQUASH_HASH_CONFIG_KEY)
2715 if last_uploaded_rev and current_rev != last_uploaded_rev:
2716 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002717 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002718 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002719 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002720 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002721 if len(change_ids) == 1:
2722 change_id = change_ids[0]
2723 else:
2724 change_id = GenerateGerritChangeId(change_desc.description)
2725 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002726
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002727 if options.preserve_tryjobs:
2728 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002729
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002730 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002731 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002732 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002733 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002734 with gclient_utils.temporary_file() as desc_tempfile:
2735 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2736 ref_to_push = RunGit(
2737 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002738 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002739 if options.no_add_changeid:
2740 pass
2741 else: # adding Change-Ids is okay.
2742 if not git_footers.get_footer_change_id(change_desc.description):
2743 DownloadGerritHook(False)
2744 change_desc.set_description(
2745 self._AddChangeIdToCommitMessage(change_desc.description,
2746 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002747 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002748 # For no-squash mode, we assume the remote called "origin" is the one we
2749 # want. It is not worthwhile to support different workflows for
2750 # no-squash mode.
2751 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002752 # attempt to extract the changeid from the current description
2753 # fail informatively if not possible.
2754 change_id_candidates = git_footers.get_footer_change_id(
2755 change_desc.description)
2756 if not change_id_candidates:
2757 DieWithError("Unable to extract change-id from message.")
2758 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002759
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002760 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002761 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2762 ref_to_push)]).splitlines()
2763 if len(commits) > 1:
2764 print('WARNING: This will upload %d commits. Run the following command '
2765 'to see which commits will be uploaded: ' % len(commits))
2766 print('git log %s..%s' % (parent, ref_to_push))
2767 print('You can also use `git squash-branch` to squash these into a '
2768 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002769 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002770
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002771 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002772 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002773 # Add default, watchlist, presubmit ccs if this is the initial upload
2774 # and CL is not private and auto-ccing has not been disabled.
2775 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002776 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002777 if len(cc) > 100:
2778 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2779 'process/lsc/lsc_workflow.md')
2780 print('WARNING: This will auto-CC %s users.' % len(cc))
2781 print('LSC may be more appropriate: %s' % lsc)
2782 print('You can also use the --no-autocc flag to disable auto-CC.')
2783 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002784 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002785 if options.cc:
2786 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002787 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002788 if change_desc.get_cced():
2789 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002790 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002791 valid_accounts = set(reviewers + cc)
2792 # TODO(crbug/877717): relax this for all hosts.
2793 else:
2794 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002795 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002796 logging.info('accounts %s are recognized, %s invalid',
2797 sorted(valid_accounts),
2798 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002799
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002800 # Extra options that can be specified at push time. Doc:
2801 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002802 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002803
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002804 for r in sorted(reviewers):
2805 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002806 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002807 reviewers.remove(r)
2808 else:
2809 # TODO(tandrii): this should probably be a hard failure.
2810 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2811 % r)
2812 for c in sorted(cc):
2813 # refspec option will be rejected if cc doesn't correspond to an
2814 # account, even though REST call to add such arbitrary cc may succeed.
2815 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002816 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002817 cc.remove(c)
2818
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002819 refspec_suffix = ''
2820 if refspec_opts:
2821 refspec_suffix = '%' + ','.join(refspec_opts)
2822 assert ' ' not in refspec_suffix, (
2823 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2824 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002825
Edward Lemur1b52d872019-05-09 21:12:12 +00002826 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002827 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002828 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002829 'change_id': change_id,
2830 'description': change_desc.description,
2831 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002832
Gavin Mak4e5e3992022-11-14 22:40:12 +00002833 # Gerrit may or may not update fast enough to return the correct patchset
2834 # number after we push. Get the pre-upload patchset and increment later.
2835 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2836
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002837 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002838 git_push_metadata,
2839 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002840
2841 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002842 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002843 change_numbers = [m.group(1)
2844 for m in map(regex.match, push_stdout.splitlines())
2845 if m]
2846 if len(change_numbers) != 1:
2847 DieWithError(
2848 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002849 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002851 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002852 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002853
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002854 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002855 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002856 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002857 gerrit_util.AddReviewers(self.GetGerritHost(),
2858 self._GerritChangeIdentifier(),
2859 reviewers,
2860 cc,
2861 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002862
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002863 return 0
2864
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002865 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2866 change_desc):
2867 """Computes parent of the generated commit to be uploaded to Gerrit.
2868
2869 Returns revision or a ref name.
2870 """
2871 if custom_cl_base:
2872 # Try to avoid creating additional unintended CLs when uploading, unless
2873 # user wants to take this risk.
2874 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2875 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2876 local_ref_of_target_remote])
2877 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002878 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002879 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2880 'If you proceed with upload, more than 1 CL may be created by '
2881 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2882 'If you are certain that specified base `%s` has already been '
2883 'uploaded to Gerrit as another CL, you may proceed.\n' %
2884 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2885 if not force:
2886 confirm_or_exit(
2887 'Do you take responsibility for cleaning up potential mess '
2888 'resulting from proceeding with upload?',
2889 action='upload')
2890 return custom_cl_base
2891
Aaron Gablef97e33d2017-03-30 15:44:27 -07002892 if remote != '.':
2893 return self.GetCommonAncestorWithUpstream()
2894
2895 # If our upstream branch is local, we base our squashed commit on its
2896 # squashed version.
2897 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2898
Aaron Gablef97e33d2017-03-30 15:44:27 -07002899 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002900 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002901 if upstream_branch_name == 'main':
2902 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002903
2904 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002905 # TODO(tandrii): consider checking parent change in Gerrit and using its
2906 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2907 # the tree hash of the parent branch. The upside is less likely bogus
2908 # requests to reupload parent change just because it's uploadhash is
2909 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002910 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2911 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002912 # Verify that the upstream branch has been uploaded too, otherwise
2913 # Gerrit will create additional CLs when uploading.
2914 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2915 RunGitSilent(['rev-parse', parent + ':'])):
2916 DieWithError(
2917 '\nUpload upstream branch %s first.\n'
2918 'It is likely that this branch has been rebased since its last '
2919 'upload, so you just need to upload it again.\n'
2920 '(If you uploaded it with --no-squash, then branch dependencies '
2921 'are not supported, and you should reupload with --squash.)'
2922 % upstream_branch_name,
2923 change_desc)
2924 return parent
2925
Gavin Mak4e5e3992022-11-14 22:40:12 +00002926 def _UpdateWithExternalChanges(self):
2927 """Updates workspace with external changes.
2928
2929 Returns the commit hash that should be used as the merge base on upload.
2930 """
2931 local_ps = self.GetPatchset()
2932 if local_ps is None:
2933 return
2934
2935 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002936 if external_ps is None or local_ps == external_ps or \
2937 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002938 return
2939
2940 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002941 if num_changes > 1:
2942 change_words = 'changes were'
2943 else:
2944 change_words = 'change was'
2945 print('\n%d external %s published to %s:\n' %
2946 (num_changes, change_words, self.GetIssueURL(short=True)))
2947
2948 # Print an overview of external changes.
2949 ps_to_commit = {}
2950 ps_to_info = {}
2951 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2952 for commit_id, revision_info in revisions.get('revisions', {}).items():
2953 ps_num = revision_info['_number']
2954 ps_to_commit[ps_num] = commit_id
2955 ps_to_info[ps_num] = revision_info
2956
2957 for ps in range(external_ps, local_ps, -1):
2958 commit = ps_to_commit[ps][:8]
2959 desc = ps_to_info[ps].get('description', '')
2960 print('Patchset %d [%s] %s' % (ps, commit, desc))
2961
Josip Sokcevic43ceaf02023-05-25 15:56:00 +00002962 print('\nSee diff at: %s/%d..%d' %
2963 (self.GetIssueURL(short=True), local_ps, external_ps))
2964 print('\nUploading without applying patches will override them.')
2965
2966 if not ask_for_explicit_yes('Get the latest changes and apply on top?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002967 return
2968
2969 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2970 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2971 external_base = external_parent['commit']
2972
2973 branch = git_common.current_branch()
2974 local_base = self.GetCommonAncestorWithUpstream()
2975 if local_base != external_base:
2976 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2977 (local_base, external_base))
2978 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00002979 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2980 'Continue with upload and override the latest changes?')
2981 return
2982 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00002983
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00002984 external_parent_last_uploaded = self._GetChangeCommit(
2985 revision=local_ps)['parents'][0]
2986 external_base_last_uploaded = external_parent_last_uploaded['commit']
2987
2988 if external_base != external_base_last_uploaded:
2989 print('\nPatch set merge bases are different (%s, %s).\n' %
2990 (external_base_last_uploaded, external_base))
2991 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2992 'Continue with upload and override the latest changes?')
2993 return
2994
Gavin Mak4e5e3992022-11-14 22:40:12 +00002995 # Fetch Gerrit's CL base if it doesn't exist locally.
2996 remote, _ = self.GetRemoteBranch()
2997 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2998 RunGitSilent(['fetch', remote, external_base])
2999
3000 # Get the diff between local_ps and external_ps.
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003001 print('Fetching changes...')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003002 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003003 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003004 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3005 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3006 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3007 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003008
3009 # If the commit parents are different, don't apply the diff as it very
3010 # likely contains many more changes not relevant to this CL.
3011 parents = RunGitSilent(
3012 ['rev-parse',
3013 '%s~1' % (last_uploaded),
3014 '%s~1' % (latest_external)]).strip().split()
3015 assert len(parents) == 2, 'Expected two parents.'
3016 if parents[0] != parents[1]:
3017 confirm_or_exit(
3018 'Can\'t apply the latest changes from Gerrit (parent mismatch '
3019 'between PS).\n'
3020 'Continue with upload and override the latest changes?')
3021 return
3022
Gavin Mak4e5e3992022-11-14 22:40:12 +00003023 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3024
3025 # Diff can be empty in the case of trivial rebases.
3026 if not diff:
3027 return external_base
3028
3029 # Apply the diff.
3030 with gclient_utils.temporary_file() as diff_tempfile:
3031 gclient_utils.FileWrite(diff_tempfile, diff)
3032 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3033 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3034 if not clean_patch:
3035 # Normally patchset is set after upload. But because we exit, that never
3036 # happens. Updating here makes sure that subsequent uploads don't need
3037 # to fetch/apply the same diff again.
3038 self.SetPatchset(external_ps)
3039 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3040 'conflicts and reupload.')
3041
3042 message = 'Incorporate external changes from '
3043 if num_changes == 1:
3044 message += 'patchset %d' % external_ps
3045 else:
3046 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3047 RunGitSilent(['commit', '-am', message])
3048 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3049 # patchset title instead of this 'Incorporate' message.
3050 return external_base
3051
Edward Lemura12175c2020-03-09 16:58:26 +00003052 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003053 """Re-commits using the current message, assumes the commit hook is in
3054 place.
3055 """
Edward Lemura12175c2020-03-09 16:58:26 +00003056 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003057 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003058 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003059 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003060 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003061
3062 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003063
tandriie113dfd2016-10-11 10:20:12 -07003064 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003065 try:
3066 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003067 except GerritChangeNotExists:
3068 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003069
3070 if data['status'] in ('ABANDONED', 'MERGED'):
3071 return 'CL %s is closed' % self.GetIssue()
3072
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003073 def GetGerritChange(self, patchset=None):
3074 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003075 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003076 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003077 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003078 data = self._GetChangeDetail(['ALL_REVISIONS'])
3079
3080 assert host and issue and patchset, 'CL must be uploaded first'
3081
3082 has_patchset = any(
3083 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003084 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003085 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003086 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003087 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003088
tandrii8c5a3532016-11-04 07:52:02 -07003089 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003090 'host': host,
3091 'change': issue,
3092 'project': data['project'],
3093 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003094 }
tandriie113dfd2016-10-11 10:20:12 -07003095
tandriide281ae2016-10-12 06:02:30 -07003096 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003097 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003098
Edward Lemur707d70b2018-02-07 00:50:14 +01003099 def GetReviewers(self):
3100 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003101 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003102
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003103
Lei Zhang8a0efc12020-08-05 19:58:45 +00003104def _get_bug_line_values(default_project_prefix, bugs):
3105 """Given default_project_prefix and comma separated list of bugs, yields bug
3106 line values.
tandriif9aefb72016-07-01 09:06:51 -07003107
3108 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003109 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003110 * string, which is left as is.
3111
3112 This function may produce more than one line, because bugdroid expects one
3113 project per line.
3114
Lei Zhang8a0efc12020-08-05 19:58:45 +00003115 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003116 ['v8:123', 'chromium:789']
3117 """
3118 default_bugs = []
3119 others = []
3120 for bug in bugs.split(','):
3121 bug = bug.strip()
3122 if bug:
3123 try:
3124 default_bugs.append(int(bug))
3125 except ValueError:
3126 others.append(bug)
3127
3128 if default_bugs:
3129 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003130 if default_project_prefix:
3131 if not default_project_prefix.endswith(':'):
3132 default_project_prefix += ':'
3133 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003134 else:
3135 yield default_bugs
3136 for other in sorted(others):
3137 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3138 yield other
3139
3140
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003141class ChangeDescription(object):
3142 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003143 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003144 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003145 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003146 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003147 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003148 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3149 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003150 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003151 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003152
Dan Beamd8b04ca2019-10-10 21:23:26 +00003153 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003154 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003155 if bug:
3156 regexp = re.compile(self.BUG_LINE)
3157 prefix = settings.GetBugPrefix()
3158 if not any((regexp.match(line) for line in self._description_lines)):
3159 values = list(_get_bug_line_values(prefix, bug))
3160 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003161 if fixed:
3162 regexp = re.compile(self.FIXED_LINE)
3163 prefix = settings.GetBugPrefix()
3164 if not any((regexp.match(line) for line in self._description_lines)):
3165 values = list(_get_bug_line_values(prefix, fixed))
3166 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003167
agable@chromium.org42c20792013-09-12 17:34:49 +00003168 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003169 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003170 return '\n'.join(self._description_lines)
3171
3172 def set_description(self, desc):
Gavin Makcc976552023-08-28 17:01:52 +00003173 if isinstance(desc, str):
agable@chromium.org42c20792013-09-12 17:34:49 +00003174 lines = desc.splitlines()
3175 else:
3176 lines = [line.rstrip() for line in desc]
3177 while lines and not lines[0]:
3178 lines.pop(0)
3179 while lines and not lines[-1]:
3180 lines.pop(-1)
3181 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003182
Edward Lemur5a644f82020-03-18 16:44:57 +00003183 def ensure_change_id(self, change_id):
3184 description = self.description
3185 footer_change_ids = git_footers.get_footer_change_id(description)
3186 # Make sure that the Change-Id in the description matches the given one.
3187 if footer_change_ids != [change_id]:
3188 if footer_change_ids:
3189 # Remove any existing Change-Id footers since they don't match the
3190 # expected change_id footer.
3191 description = git_footers.remove_footer(description, 'Change-Id')
3192 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3193 'if you want to set a new one.')
3194 # Add the expected Change-Id footer.
3195 description = git_footers.add_footer_change_id(description, change_id)
3196 self.set_description(description)
3197
Joanna Wang39811b12023-01-20 23:09:48 +00003198 def update_reviewers(self, reviewers):
3199 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003200
3201 Args:
3202 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003203 """
Joanna Wang39811b12023-01-20 23:09:48 +00003204 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003205 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206
3207 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003208
Joanna Wang39811b12023-01-20 23:09:48 +00003209 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003210 regexp = re.compile(self.R_LINE)
3211 matches = [regexp.match(line) for line in self._description_lines]
3212 new_desc = [l for i, l in enumerate(self._description_lines)
3213 if not matches[i]]
3214 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215
Joanna Wang39811b12023-01-20 23:09:48 +00003216 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003217
Joanna Wang39811b12023-01-20 23:09:48 +00003218 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003219 for match in matches:
3220 if not match:
3221 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003222 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003223
Joanna Wang39811b12023-01-20 23:09:48 +00003224 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003225
3226 # Put the new lines in the description where the old first R= line was.
3227 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3228 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003229 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003230 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003231 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003233 def set_preserve_tryjobs(self):
3234 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3235 footers = git_footers.parse_footers(self.description)
3236 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3237 if v.lower() == 'true':
3238 return
3239 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3240
Anthony Polito8b955342019-09-24 19:01:36 +00003241 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 self.set_description([
3244 '# Enter a description of the change.',
3245 '# This will be displayed on the codereview site.',
3246 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003247 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003248 '--------------------',
3249 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003250 bug_regexp = re.compile(self.BUG_LINE)
3251 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003252 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003253 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003254
Dan Beamd8b04ca2019-10-10 21:23:26 +00003255 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003256 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003257
Bruce Dawsonfc487042020-10-27 19:11:37 +00003258 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003260 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003261 if not content:
3262 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003263 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264
Bruce Dawson2377b012018-01-11 16:46:49 -08003265 # Strip off comments and default inserted "Bug:" line.
3266 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003267 (line.startswith('#') or
3268 line.rstrip() == "Bug:" or
3269 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003270 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003271 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003272 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003273
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003274 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003275 """Adds a footer line to the description.
3276
3277 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3278 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3279 that Gerrit footers are always at the end.
3280 """
3281 parsed_footer_line = git_footers.parse_footer(line)
3282 if parsed_footer_line:
3283 # Line is a gerrit footer in the form: Footer-Key: any value.
3284 # Thus, must be appended observing Gerrit footer rules.
3285 self.set_description(
3286 git_footers.add_footer(self.description,
3287 key=parsed_footer_line[0],
3288 value=parsed_footer_line[1]))
3289 return
3290
3291 if not self._description_lines:
3292 self._description_lines.append(line)
3293 return
3294
3295 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3296 if gerrit_footers:
3297 # git_footers.split_footers ensures that there is an empty line before
3298 # actual (gerrit) footers, if any. We have to keep it that way.
3299 assert top_lines and top_lines[-1] == ''
3300 top_lines, separator = top_lines[:-1], top_lines[-1:]
3301 else:
3302 separator = [] # No need for separator if there are no gerrit_footers.
3303
3304 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003305 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3306 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003307 top_lines.append('')
3308 top_lines.append(line)
3309 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003310
tandrii99a72f22016-08-17 14:33:24 -07003311 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003312 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003313 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003314 reviewers = [match.group(2).strip()
3315 for match in matches
3316 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003317 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003318
bradnelsond975b302016-10-23 12:20:23 -07003319 def get_cced(self):
3320 """Retrieves the list of reviewers."""
3321 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3322 cced = [match.group(2).strip() for match in matches if match]
3323 return cleanup_list(cced)
3324
Nodir Turakulov23b82142017-11-16 11:04:25 -08003325 def get_hash_tags(self):
3326 """Extracts and sanitizes a list of Gerrit hashtags."""
3327 subject = (self._description_lines or ('',))[0]
3328 subject = re.sub(
3329 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3330
3331 tags = []
3332 start = 0
3333 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3334 while True:
3335 m = bracket_exp.match(subject, start)
3336 if not m:
3337 break
3338 tags.append(self.sanitize_hash_tag(m.group(1)))
3339 start = m.end()
3340
3341 if not tags:
3342 # Try "Tag: " prefix.
3343 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3344 if m:
3345 tags.append(self.sanitize_hash_tag(m.group(1)))
3346 return tags
3347
3348 @classmethod
3349 def sanitize_hash_tag(cls, tag):
3350 """Returns a sanitized Gerrit hash tag.
3351
3352 A sanitized hashtag can be used as a git push refspec parameter value.
3353 """
3354 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3355
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003356
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003357def FindCodereviewSettingsFile(filename='codereview.settings'):
3358 """Finds the given file starting in the cwd and going up.
3359
3360 Only looks up to the top of the repository unless an
3361 'inherit-review-settings-ok' file exists in the root of the repository.
3362 """
3363 inherit_ok_file = 'inherit-review-settings-ok'
3364 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003365 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003366 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003367 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003368 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003369 if os.path.isfile(os.path.join(cwd, filename)):
3370 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003371 if cwd == root:
3372 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003373 parent_dir = os.path.dirname(cwd)
3374 if parent_dir == cwd:
3375 # We hit the system root directory.
3376 break
3377 cwd = parent_dir
3378 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003379
3380
3381def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003382 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003383 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003384
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003385 def SetProperty(name, setting, unset_error_ok=False):
3386 fullname = 'rietveld.' + name
3387 if setting in keyvals:
3388 RunGit(['config', fullname, keyvals[setting]])
3389 else:
3390 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3391
tandrii48df5812016-10-17 03:55:37 -07003392 if not keyvals.get('GERRIT_HOST', False):
3393 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003394 # Only server setting is required. Other settings can be absent.
3395 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003396 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3398 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003399 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003400 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3401 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003402 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3403 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003404 SetProperty(
3405 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003407 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003408 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003409
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003410 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003411 RunGit(['config', 'gerrit.squash-uploads',
3412 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003413
tandrii@chromium.org28253532016-04-14 13:46:56 +00003414 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003415 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003416 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3417
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003418 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003419 # should be of the form
3420 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3421 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003422 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3423 keyvals['ORIGIN_URL_CONFIG']])
3424
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003425
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003426def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003427 """Downloads a network object to a local file, like urllib.urlretrieve.
3428
3429 This is necessary because urllib is broken for SSL connections via a proxy.
3430 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003431 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003432 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003433
3434
ukai@chromium.org712d6102013-11-27 00:52:58 +00003435def hasSheBang(fname):
3436 """Checks fname is a #! script."""
3437 with open(fname) as f:
3438 return f.read(2).startswith('#!')
3439
3440
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003441def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003442 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003443
3444 Args:
3445 force: True to update hooks. False to install hooks if not present.
3446 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003447 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003448 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3449 if not os.access(dst, os.X_OK):
3450 if os.path.exists(dst):
3451 if not force:
3452 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003453 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003454 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003455 if not hasSheBang(dst):
3456 DieWithError('Not a script: %s\n'
3457 'You need to download from\n%s\n'
3458 'into .git/hooks/commit-msg and '
3459 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003460 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3461 except Exception:
3462 if os.path.exists(dst):
3463 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003464 DieWithError('\nFailed to download hooks.\n'
3465 'You need to download from\n%s\n'
3466 'into .git/hooks/commit-msg and '
3467 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003468
3469
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003470class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003471 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003472
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003473 def __init__(self):
3474 # Cached list of [host, identity, source], where source is either
3475 # .gitcookies or .netrc.
3476 self._all_hosts = None
3477
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003478 def ensure_configured_gitcookies(self):
3479 """Runs checks and suggests fixes to make git use .gitcookies from default
3480 path."""
3481 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3482 configured_path = RunGitSilent(
3483 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003484 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003485 if configured_path:
3486 self._ensure_default_gitcookies_path(configured_path, default)
3487 else:
3488 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003489
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003490 @staticmethod
3491 def _ensure_default_gitcookies_path(configured_path, default_path):
3492 assert configured_path
3493 if configured_path == default_path:
3494 print('git is already configured to use your .gitcookies from %s' %
3495 configured_path)
3496 return
3497
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003498 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003499 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3500 (configured_path, default_path))
3501
3502 if not os.path.exists(configured_path):
3503 print('However, your configured .gitcookies file is missing.')
3504 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3505 action='reconfigure')
3506 RunGit(['config', '--global', 'http.cookiefile', default_path])
3507 return
3508
3509 if os.path.exists(default_path):
3510 print('WARNING: default .gitcookies file already exists %s' %
3511 default_path)
3512 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3513 default_path)
3514
3515 confirm_or_exit('Move existing .gitcookies to default location?',
3516 action='move')
3517 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003518 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003519 print('Moved and reconfigured git to use .gitcookies from %s' %
3520 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003521
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003522 @staticmethod
3523 def _configure_gitcookies_path(default_path):
3524 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3525 if os.path.exists(netrc_path):
3526 print('You seem to be using outdated .netrc for git credentials: %s' %
3527 netrc_path)
3528 print('This tool will guide you through setting up recommended '
3529 '.gitcookies store for git credentials.\n'
3530 '\n'
3531 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3532 ' git config --global --unset http.cookiefile\n'
3533 ' mv %s %s.backup\n\n' % (default_path, default_path))
3534 confirm_or_exit(action='setup .gitcookies')
3535 RunGit(['config', '--global', 'http.cookiefile', default_path])
3536 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003537
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003538 def get_hosts_with_creds(self, include_netrc=False):
3539 if self._all_hosts is None:
3540 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003541 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3542 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3543 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3544 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003545
3546 if include_netrc:
3547 return self._all_hosts
3548 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3549
3550 def print_current_creds(self, include_netrc=False):
3551 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3552 if not hosts:
3553 print('No Git/Gerrit credentials found')
3554 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003555 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003556 header = [('Host', 'User', 'Which file'),
3557 ['=' * l for l in lengths]]
3558 for row in (header + hosts):
3559 print('\t'.join((('%%+%ds' % l) % s)
3560 for l, s in zip(lengths, row)))
3561
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003562 @staticmethod
3563 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003564 """Parses identity "git-<username>.domain" into <username> and domain."""
3565 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003566 # distinguishable from sub-domains. But we do know typical domains:
3567 if identity.endswith('.chromium.org'):
3568 domain = 'chromium.org'
3569 username = identity[:-len('.chromium.org')]
3570 else:
3571 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003572 if username.startswith('git-'):
3573 username = username[len('git-'):]
3574 return username, domain
3575
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003576 def has_generic_host(self):
3577 """Returns whether generic .googlesource.com has been configured.
3578
3579 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3580 """
3581 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003582 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003583 return True
3584 return False
3585
3586 def _get_git_gerrit_identity_pairs(self):
3587 """Returns map from canonic host to pair of identities (Git, Gerrit).
3588
3589 One of identities might be None, meaning not configured.
3590 """
3591 host_to_identity_pairs = {}
3592 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003593 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003594 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3595 idx = 0 if canonical == host else 1
3596 pair[idx] = identity
3597 return host_to_identity_pairs
3598
3599 def get_partially_configured_hosts(self):
3600 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003601 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003602 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003603 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003604
3605 def get_conflicting_hosts(self):
3606 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003607 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003608 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003609 if None not in (i1, i2) and i1 != i2)
3610
3611 def get_duplicated_hosts(self):
3612 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003613 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003614
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003615
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003616 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003617 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003618 hosts = sorted(hosts)
3619 assert hosts
3620 if extra_column_func is None:
3621 extras = [''] * len(hosts)
3622 else:
3623 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003624 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3625 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003626 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003627 lines.append(tmpl % he)
3628 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003629
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003630 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003632 yield ('.googlesource.com wildcard record detected',
3633 ['Chrome Infrastructure team recommends to list full host names '
3634 'explicitly.'],
3635 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003636
3637 dups = self.get_duplicated_hosts()
3638 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003639 yield ('The following hosts were defined twice',
3640 self._format_hosts(dups),
3641 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003642
3643 partial = self.get_partially_configured_hosts()
3644 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003645 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3646 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003647 self._format_hosts(
3648 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3649 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003650
3651 conflicting = self.get_conflicting_hosts()
3652 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003653 yield ('The following Git hosts have differing credentials from their '
3654 'Gerrit counterparts',
3655 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3656 tuple(self._get_git_gerrit_identity_pairs()[host])),
3657 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003658
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 def find_and_report_problems(self):
3660 """Returns True if there was at least one problem, else False."""
3661 found = False
3662 bad_hosts = set()
3663 for title, sublines, hosts in self._find_problems():
3664 if not found:
3665 found = True
3666 print('\n\n.gitcookies problem report:\n')
3667 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003668 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003669 if sublines:
3670 print()
3671 print(' %s' % '\n '.join(sublines))
3672 print()
3673
3674 if bad_hosts:
3675 assert found
3676 print(' You can manually remove corresponding lines in your %s file and '
3677 'visit the following URLs with correct account to generate '
3678 'correct credential lines:\n' %
3679 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003680 print(' %s' % '\n '.join(
3681 sorted(
3682 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3683 _canonical_git_googlesource_host(host))
3684 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003685 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003686
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003687
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003688@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003689def CMDcreds_check(parser, args):
3690 """Checks credentials and suggests changes."""
3691 _, _ = parser.parse_args(args)
3692
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003693 # Code below checks .gitcookies. Abort if using something else.
3694 authn = gerrit_util.Authenticator.get()
3695 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003696 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003697 'This command is not designed for bot environment. It checks '
3698 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003699 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3700 if isinstance(authn, gerrit_util.GceAuthenticator):
3701 message += (
3702 '\n'
3703 'If you need to run this on GCE or a cloudtop instance, '
3704 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3705 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003706
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003707 checker = _GitCookiesChecker()
3708 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003709
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003710 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003711 checker.print_current_creds(include_netrc=True)
3712
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003713 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003714 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003715 return 0
3716 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003717
3718
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003719@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003720def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003721 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003722 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003723 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003724 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003725 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003726 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003727 return RunGit(['config', 'branch.%s.base-url' % branch],
3728 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003729
3730 print('Setting base-url to %s' % args[0])
3731 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3732 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003733
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003734
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003735def color_for_status(status):
3736 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003737 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003738 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003739 'unsent': BOLD + Fore.YELLOW,
3740 'waiting': BOLD + Fore.RED,
3741 'reply': BOLD + Fore.YELLOW,
3742 'not lgtm': BOLD + Fore.RED,
3743 'lgtm': BOLD + Fore.GREEN,
3744 'commit': BOLD + Fore.MAGENTA,
3745 'closed': BOLD + Fore.CYAN,
3746 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003747 }.get(status, Fore.WHITE)
3748
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003749
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003750def get_cl_statuses(changes, fine_grained, max_processes=None):
3751 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003752
3753 If fine_grained is true, this will fetch CL statuses from the server.
3754 Otherwise, simply indicate if there's a matching url for the given branches.
3755
3756 If max_processes is specified, it is used as the maximum number of processes
3757 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3758 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003759
3760 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003761 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003762 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003763 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003764
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003765 if not fine_grained:
3766 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003767 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003768 for cl in changes:
3769 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003770 return
3771
3772 # First, sort out authentication issues.
3773 logging.debug('ensuring credentials exist')
3774 for cl in changes:
3775 cl.EnsureAuthenticated(force=False, refresh=True)
3776
3777 def fetch(cl):
3778 try:
3779 return (cl, cl.GetStatus())
3780 except:
3781 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003782 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003783 raise
3784
3785 threads_count = len(changes)
3786 if max_processes:
3787 threads_count = max(1, min(threads_count, max_processes))
3788 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3789
Edward Lemur61bf4172020-02-24 23:22:37 +00003790 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003791 fetched_cls = set()
3792 try:
3793 it = pool.imap_unordered(fetch, changes).__iter__()
3794 while True:
3795 try:
3796 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003797 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003798 break
3799 fetched_cls.add(cl)
3800 yield cl, status
3801 finally:
3802 pool.close()
3803
3804 # Add any branches that failed to fetch.
3805 for cl in set(changes) - fetched_cls:
3806 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003807
rmistry@google.com2dd99862015-06-22 12:22:18 +00003808
Jose Lopes3863fc52020-04-07 17:00:25 +00003809def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003810 """Uploads CLs of local branches that are dependents of the current branch.
3811
3812 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003813
3814 test1 -> test2.1 -> test3.1
3815 -> test3.2
3816 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003817
3818 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3819 run on the dependent branches in this order:
3820 test2.1, test3.1, test3.2, test2.2, test3.3
3821
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003822 Note: This function does not rebase your local dependent branches. Use it
3823 when you make a change to the parent branch that will not conflict
3824 with its dependent branches, and you would like their dependencies
3825 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003826 """
3827 if git_common.is_dirty_git_tree('upload-branch-deps'):
3828 return 1
3829
3830 root_branch = cl.GetBranch()
3831 if root_branch is None:
3832 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3833 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003834 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3836 'patchset dependencies without an uploaded CL.')
3837
3838 branches = RunGit(['for-each-ref',
3839 '--format=%(refname:short) %(upstream:short)',
3840 'refs/heads'])
3841 if not branches:
3842 print('No local branches found.')
3843 return 0
3844
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003845 # Create a dictionary of all local branches to the branches that are
3846 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003847 tracked_to_dependents = collections.defaultdict(list)
3848 for b in branches.splitlines():
3849 tokens = b.split()
3850 if len(tokens) == 2:
3851 branch_name, tracked = tokens
3852 tracked_to_dependents[tracked].append(branch_name)
3853
vapiera7fbd5a2016-06-16 09:17:49 -07003854 print()
3855 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003856 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003857
rmistry@google.com2dd99862015-06-22 12:22:18 +00003858 def traverse_dependents_preorder(branch, padding=''):
3859 dependents_to_process = tracked_to_dependents.get(branch, [])
3860 padding += ' '
3861 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003862 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003863 dependents.append(dependent)
3864 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003865
rmistry@google.com2dd99862015-06-22 12:22:18 +00003866 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003867 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003868
3869 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003870 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003871 return 0
3872
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 # Record all dependents that failed to upload.
3874 failures = {}
3875 # Go through all dependents, checkout the branch and upload.
3876 try:
3877 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003878 print()
3879 print('--------------------------------------')
3880 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003881 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003882 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 try:
3884 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003886 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003887 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 finally:
3891 # Swap back to the original root branch.
3892 RunGit(['checkout', '-q', root_branch])
3893
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print()
3895 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003896 for dependent_branch in dependents:
3897 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print(' %s : %s' % (dependent_branch, upload_status))
3899 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900
3901 return 0
3902
3903
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003904def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003905 """Given a proposed tag name, returns a tag name that is guaranteed to be
3906 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3907 or 'foo-3', and so on."""
3908
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003909 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003910 for suffix_num in itertools.count(1):
3911 if suffix_num == 1:
3912 to_check = proposed_tag
3913 else:
3914 to_check = '%s-%d' % (proposed_tag, suffix_num)
3915
3916 if to_check not in existing_tags:
3917 return to_check
3918
3919
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003920@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003921def CMDarchive(parser, args):
3922 """Archives and deletes branches associated with closed changelists."""
3923 parser.add_option(
3924 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003925 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003926 parser.add_option(
3927 '-f', '--force', action='store_true',
3928 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003929 parser.add_option(
3930 '-d', '--dry-run', action='store_true',
3931 help='Skip the branch tagging and removal steps.')
3932 parser.add_option(
3933 '-t', '--notags', action='store_true',
3934 help='Do not tag archived branches. '
3935 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003936 parser.add_option(
3937 '-p',
3938 '--pattern',
3939 default='git-cl-archived-{issue}-{branch}',
3940 help='Format string for archive tags. '
3941 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003942
kmarshall3bff56b2016-06-06 18:31:47 -07003943 options, args = parser.parse_args(args)
3944 if args:
3945 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003946
3947 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3948 if not branches:
3949 return 0
3950
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003951 tags = RunGit(['for-each-ref', '--format=%(refname)',
3952 'refs/tags']).splitlines() or []
3953 tags = [t.split('/')[-1] for t in tags]
3954
vapiera7fbd5a2016-06-16 09:17:49 -07003955 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003956 changes = [Changelist(branchref=b)
3957 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003958 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3959 statuses = get_cl_statuses(changes,
3960 fine_grained=True,
3961 max_processes=options.maxjobs)
3962 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003963 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3964 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003965 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003966 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003967 proposal.sort()
3968
3969 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003970 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003971 return 0
3972
Edward Lemur85153282020-02-14 22:06:29 +00003973 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003974
vapiera7fbd5a2016-06-16 09:17:49 -07003975 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003976 if options.notags:
3977 for next_item in proposal:
3978 print(' ' + next_item[0])
3979 else:
3980 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3981 for next_item in proposal:
3982 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003983
kmarshall9249e012016-08-23 12:02:16 -07003984 # Quit now on precondition failure or if instructed by the user, either
3985 # via an interactive prompt or by command line flags.
3986 if options.dry_run:
3987 print('\nNo changes were made (dry run).\n')
3988 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003989
3990 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003991 print('You are currently on a branch \'%s\' which is associated with a '
3992 'closed codereview issue, so archive cannot proceed. Please '
3993 'checkout another branch and run this command again.' %
3994 current_branch)
3995 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003996
3997 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003998 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003999 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004000 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004001 return 1
4002
4003 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004004 if not options.notags:
4005 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004006
4007 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4008 # Clean up the tag if we failed to delete the branch.
4009 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004010
vapiera7fbd5a2016-06-16 09:17:49 -07004011 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004012
4013 return 0
4014
4015
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004016@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004017def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004018 """Show status of changelists.
4019
4020 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004021 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004022 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004023 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004024 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004025 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004026 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004027 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004028
4029 Also see 'git cl comments'.
4030 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004031 parser.add_option(
4032 '--no-branch-color',
4033 action='store_true',
4034 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004035 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004036 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004037 parser.add_option('-f', '--fast', action='store_true',
4038 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004039 parser.add_option(
4040 '-j', '--maxjobs', action='store', type=int,
4041 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004042 parser.add_option(
4043 '-i', '--issue', type=int,
4044 help='Operate on this issue instead of the current branch\'s implicit '
4045 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004046 parser.add_option('-d',
4047 '--date-order',
4048 action='store_true',
4049 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004050 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004051 if args:
4052 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053
iannuccie53c9352016-08-17 14:40:40 -07004054 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004055 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004056
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004057 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004058 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004060 if cl.GetIssue():
4061 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062 elif options.field == 'id':
4063 issueid = cl.GetIssue()
4064 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004065 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004067 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004068 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004070 elif options.field == 'status':
4071 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004072 elif options.field == 'url':
4073 url = cl.GetIssueURL()
4074 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004076 return 0
4077
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004078 branches = RunGit([
4079 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4080 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004081 if not branches:
4082 print('No local branch found.')
4083 return 0
4084
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004085 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004086 Changelist(branchref=b, commit_date=ct)
4087 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4088 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004089 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004090 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004091 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004092 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004093
Edward Lemur85153282020-02-14 22:06:29 +00004094 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004095
4096 def FormatBranchName(branch, colorize=False):
4097 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4098 an asterisk when it is the current branch."""
4099
4100 asterisk = ""
4101 color = Fore.RESET
4102 if branch == current_branch:
4103 asterisk = "* "
4104 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004105 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004106
4107 if colorize:
4108 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004109 return asterisk + branch_name
4110
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004111 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004112
4113 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004114
4115 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004116 sorted_changes = sorted(changes,
4117 key=lambda c: c.GetCommitDate(),
4118 reverse=True)
4119 else:
4120 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4121 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004122 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004123 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004124 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004125 branch_statuses[c.GetBranch()] = status
4126 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004127 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004128 if url and (not status or status == 'error'):
4129 # The issue probably doesn't exist anymore.
4130 url += ' (broken)'
4131
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004132 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004133 # Turn off bold as well as colors.
4134 END = '\033[0m'
4135 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004136 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004137 color = ''
4138 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004139 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004140
Alan Cuttera3be9a52019-03-04 18:50:33 +00004141 branch_display = FormatBranchName(branch)
4142 padding = ' ' * (alignment - len(branch_display))
4143 if not options.no_branch_color:
4144 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004145
Alan Cuttera3be9a52019-03-04 18:50:33 +00004146 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4147 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004148
vapiera7fbd5a2016-06-16 09:17:49 -07004149 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004150 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004151 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004152 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004153 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004154 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004156 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004157 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004158 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004160 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004161 return 0
4162
4163
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004164def colorize_CMDstatus_doc():
4165 """To be called once in main() to add colors to git cl status help."""
4166 colors = [i for i in dir(Fore) if i[0].isupper()]
4167
4168 def colorize_line(line):
4169 for color in colors:
4170 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004171 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004172 indent = len(line) - len(line.lstrip(' ')) + 1
4173 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4174 return line
4175
4176 lines = CMDstatus.__doc__.splitlines()
4177 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4178
4179
phajdan.jre328cf92016-08-22 04:12:17 -07004180def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004181 if path == '-':
4182 json.dump(contents, sys.stdout)
4183 else:
4184 with open(path, 'w') as f:
4185 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004186
4187
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004188@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004189@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004191 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192
4193 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004194 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004195 parser.add_option('-r', '--reverse', action='store_true',
4196 help='Lookup the branch(es) for the specified issues. If '
4197 'no issues are specified, all branches with mapped '
4198 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004199 parser.add_option('--json',
4200 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004201 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004202
dnj@chromium.org406c4402015-03-03 17:22:28 +00004203 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004204 branches = RunGit(['for-each-ref', 'refs/heads',
4205 '--format=%(refname)']).splitlines()
4206 # Reverse issue lookup.
4207 issue_branch_map = {}
4208
4209 git_config = {}
4210 for config in RunGit(['config', '--get-regexp',
4211 r'branch\..*issue']).splitlines():
4212 name, _space, val = config.partition(' ')
4213 git_config[name] = val
4214
4215 for branch in branches:
4216 issue = git_config.get(
4217 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4218 if issue:
4219 issue_branch_map.setdefault(int(issue), []).append(branch)
4220 if not args:
4221 args = sorted(issue_branch_map.keys())
4222 result = {}
4223 for issue in args:
4224 try:
4225 issue_num = int(issue)
4226 except ValueError:
4227 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4228 continue
4229 result[issue_num] = issue_branch_map.get(issue_num)
4230 print('Branch for issue number %s: %s' %
4231 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4232 if options.json:
4233 write_json(options.json, result)
4234 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004235
4236 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004237 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004238 if not issue.valid:
4239 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4240 'or no argument to list it.\n'
4241 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004242 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004243 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004244 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004245 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004246 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4247 if options.json:
4248 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004249 'gerrit_host': cl.GetGerritHost(),
4250 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004251 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004252 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004253 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254 return 0
4255
4256
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004257@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004258def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004259 """Shows or posts review comments for any changelist."""
4260 parser.add_option('-a', '--add-comment', dest='comment',
4261 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004262 parser.add_option('-p', '--publish', action='store_true',
4263 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004264 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004265 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004266 parser.add_option('-m', '--machine-readable', dest='readable',
4267 action='store_false', default=True,
4268 help='output comments in a format compatible with '
4269 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004270 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004271 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004272 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004273
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004274 issue = None
4275 if options.issue:
4276 try:
4277 issue = int(options.issue)
4278 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004279 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004280
Edward Lemur934836a2019-09-09 20:16:54 +00004281 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004282
4283 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004284 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004285 return 0
4286
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004287 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4288 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004289 for comment in summary:
4290 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004291 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004292 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004293 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004294 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004295 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004296 elif comment.autogenerated:
4297 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004298 else:
4299 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004300 print('\n%s%s %s%s\n%s' % (
4301 color,
4302 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4303 comment.sender,
4304 Fore.RESET,
4305 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4306
smut@google.comc85ac942015-09-15 16:34:43 +00004307 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004308 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004309 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004310 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4311 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004312 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004313 return 0
4314
4315
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004316@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004317@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004318def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004319 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004320 parser.add_option('-d', '--display', action='store_true',
4321 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004322 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004323 help='New description to set for this issue (- for stdin, '
4324 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004325 parser.add_option('-f', '--force', action='store_true',
4326 help='Delete any unpublished Gerrit edits for this issue '
4327 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004328
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004329 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004330
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004331 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004332 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004333 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004334 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004335 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004336
Edward Lemur934836a2019-09-09 20:16:54 +00004337 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004338 if target_issue_arg:
4339 kwargs['issue'] = target_issue_arg.issue
4340 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004341
4342 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004343 if not cl.GetIssue():
4344 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004345
Edward Lemur678a6842019-10-03 22:25:05 +00004346 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004347 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004348
Edward Lemur6c6827c2020-02-06 21:15:18 +00004349 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004350
smut@google.com34fb6b12015-07-13 20:03:26 +00004351 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004352 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004353 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004354
4355 if options.new_description:
4356 text = options.new_description
4357 if text == '-':
4358 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004359 elif text == '+':
4360 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004361 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004362
4363 description.set_description(text)
4364 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004365 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004366 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004367 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004368 return 0
4369
4370
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004371@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004372def CMDlint(parser, args):
4373 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004374 parser.add_option('--filter', action='append', metavar='-x,+y',
4375 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004376 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004377
4378 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004379 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004380 try:
4381 import cpplint
4382 import cpplint_chromium
4383 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004384 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004385 return 1
4386
4387 # Change the current working directory before calling lint so that it
4388 # shows the correct base.
4389 previous_cwd = os.getcwd()
4390 os.chdir(settings.GetRoot())
4391 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004392 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004393 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004394 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004395 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004396 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004397
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004398 # Process cpplint arguments, if any.
4399 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4400 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004401 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004402
Lei Zhang379d1ad2020-07-15 19:40:06 +00004403 include_regex = re.compile(settings.GetLintRegex())
4404 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004405 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4406 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004407 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004408 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004409 continue
4410
4411 if ignore_regex.match(filename):
4412 print('Ignoring file %s' % filename)
4413 continue
4414
4415 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4416 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004417 finally:
4418 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004419 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004420 if cpplint._cpplint_state.error_count != 0:
4421 return 1
4422 return 0
4423
4424
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004425@metrics.collector.collect_metrics('git cl presubmit')
mlcuic601e362023-08-14 23:39:46 +00004426@subcommand.usage('[base branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004428 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004429 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004430 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004431 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004432 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004433 parser.add_option('--all', action='store_true',
4434 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004435 parser.add_option('--files',
4436 nargs=1,
4437 help='Semicolon-separated list of files to be marked as '
4438 'modified when executing presubmit or post-upload hooks. '
4439 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004440 parser.add_option('--parallel', action='store_true',
4441 help='Run all tests specified by input_api.RunTests in all '
4442 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004443 parser.add_option('--resultdb', action='store_true',
4444 help='Run presubmit checks in the ResultSink environment '
4445 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004446 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004447 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004448
sbc@chromium.org71437c02015-04-09 19:29:40 +00004449 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004450 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004451 return 1
4452
Edward Lemur934836a2019-09-09 20:16:54 +00004453 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004454 if args:
4455 base_branch = args[0]
4456 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004457 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004458 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004460 start = time.time()
4461 try:
4462 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4463 description = cl.FetchDescription()
4464 else:
4465 description = _create_description_from_log([base_branch])
4466 except Exception as e:
4467 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004468 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004469 elapsed = time.time() - start
4470 if elapsed > 5:
4471 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004472
Bruce Dawson13acea32022-05-03 22:13:08 +00004473 if not base_branch:
4474 if not options.force:
4475 print('use --force to check even when not on a branch.')
4476 return 1
4477 base_branch = 'HEAD'
4478
Josip Sokcevic017544d2022-03-31 23:47:53 +00004479 cl.RunHook(committing=not options.upload,
4480 may_prompt=False,
4481 verbose=options.verbose,
4482 parallel=options.parallel,
4483 upstream=base_branch,
4484 description=description,
4485 all_files=options.all,
4486 files=options.files,
4487 resultdb=options.resultdb,
4488 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004489 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004490
4491
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004492def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004493 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004494
4495 Works the same way as
4496 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4497 but can be called on demand on all platforms.
4498
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004499 The basic idea is to generate git hash of a state of the tree, original
4500 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004501 """
4502 lines = []
4503 tree_hash = RunGitSilent(['write-tree'])
4504 lines.append('tree %s' % tree_hash.strip())
4505 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4506 if code == 0:
4507 lines.append('parent %s' % parent.strip())
4508 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4509 lines.append('author %s' % author.strip())
4510 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4511 lines.append('committer %s' % committer.strip())
4512 lines.append('')
4513 # Note: Gerrit's commit-hook actually cleans message of some lines and
4514 # whitespace. This code is not doing this, but it clearly won't decrease
4515 # entropy.
4516 lines.append(message)
4517 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004518 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004519 return 'I%s' % change_hash.strip()
4520
4521
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004522def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004523 """Computes the remote branch ref to use for the CL.
4524
4525 Args:
4526 remote (str): The git remote for the CL.
4527 remote_branch (str): The git remote branch for the CL.
4528 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004529 """
4530 if not (remote and remote_branch):
4531 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004532
wittman@chromium.org455dc922015-01-26 20:15:50 +00004533 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004534 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004535 # refs, which are then translated into the remote full symbolic refs
4536 # below.
4537 if '/' not in target_branch:
4538 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4539 else:
4540 prefix_replacements = (
4541 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4542 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4543 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4544 )
4545 match = None
4546 for regex, replacement in prefix_replacements:
4547 match = re.search(regex, target_branch)
4548 if match:
4549 remote_branch = target_branch.replace(match.group(0), replacement)
4550 break
4551 if not match:
4552 # This is a branch path but not one we recognize; use as-is.
4553 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004554 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004555 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004556 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004557 # Handle the refs that need to land in different refs.
4558 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004559
wittman@chromium.org455dc922015-01-26 20:15:50 +00004560 # Create the true path to the remote branch.
4561 # Does the following translation:
4562 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004563 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004564 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4565 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4566 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4567 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4568 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4569 'refs/heads/')
4570 elif remote_branch.startswith('refs/remotes/branch-heads'):
4571 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004572
wittman@chromium.org455dc922015-01-26 20:15:50 +00004573 return remote_branch
4574
4575
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004576def cleanup_list(l):
4577 """Fixes a list so that comma separated items are put as individual items.
4578
4579 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4580 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4581 """
4582 items = sum((i.split(',') for i in l), [])
4583 stripped_items = (i.strip() for i in items)
4584 return sorted(filter(None, stripped_items))
4585
4586
Aaron Gable4db38df2017-11-03 14:59:07 -07004587@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004588@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004589def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004590 """Uploads the current changelist to codereview.
4591
4592 Can skip dependency patchset uploads for a branch by running:
4593 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004594 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004595 git config --unset branch.branch_name.skip-deps-uploads
4596 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004597
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004598 If the name of the checked out branch starts with "bug-" or "fix-" followed
4599 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004600 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004601
4602 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004603 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004604 [git-cl] add support for hashtags
4605 Foo bar: implement foo
4606 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004607 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004608 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4609 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004610 parser.add_option('--bypass-watchlists', action='store_true',
4611 dest='bypass_watchlists',
4612 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004613 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004614 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004615 parser.add_option('--message', '-m', dest='message',
4616 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004617 parser.add_option('-b', '--bug',
4618 help='pre-populate the bug number(s) for this issue. '
4619 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004620 parser.add_option('--message-file', dest='message_file',
4621 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004622 parser.add_option('--title', '-t', dest='title',
4623 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004624 parser.add_option('-T', '--skip-title', action='store_true',
4625 dest='skip_title',
4626 help='Use the most recent commit message as the title of '
4627 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004628 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004629 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004630 help='reviewer email addresses')
4631 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004632 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004633 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004634 parser.add_option('--hashtag', dest='hashtags',
4635 action='append', default=[],
4636 help=('Gerrit hashtag for new CL; '
4637 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004638 parser.add_option('-s',
4639 '--send-mail',
4640 '--send-email',
4641 dest='send_mail',
4642 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004643 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004644 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004645 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004646 metavar='TARGET',
4647 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004648 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004649 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004650 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004651 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004652 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004653 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004654 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004655 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4656 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004657 parser.add_option('-c',
4658 '--use-commit-queue',
4659 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004660 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004661 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004662 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004663 parser.add_option('-d', '--cq-dry-run',
4664 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004665 help='Send the patchset to do a CQ dry run right after '
4666 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004667 parser.add_option('--set-bot-commit', action='store_true',
4668 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004669 parser.add_option('--preserve-tryjobs', action='store_true',
4670 help='instruct the CQ to let tryjobs running even after '
4671 'new patchsets are uploaded instead of canceling '
4672 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004673 parser.add_option('--dependencies', action='store_true',
4674 help='Uploads CLs of all the local branches that depend on '
4675 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004676 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4677 help='Sends your change to the CQ after an approval. Only '
4678 'works on repos that have the Auto-Submit label '
4679 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004680 parser.add_option('--parallel', action='store_true',
4681 help='Run all tests specified by input_api.RunTests in all '
4682 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004683 parser.add_option('--no-autocc', action='store_true',
4684 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004685 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004686 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004687 parser.add_option('-R', '--retry-failed', action='store_true',
4688 help='Retry failed tryjobs from old patchset immediately '
4689 'after uploading new patchset. Cannot be used with '
4690 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004691 parser.add_option('--fixed', '-x',
4692 help='List of bugs that will be commented on and marked '
4693 'fixed (pre-populates "Fixed:" tag). Same format as '
4694 '-b option / "Bug:" tag. If fixing several issues, '
4695 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004696 parser.add_option('--edit-description', action='store_true', default=False,
4697 help='Modify description before upload. Cannot be used '
4698 'with --force. It is a noop when --no-squash is set '
4699 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004700 parser.add_option('--git-completion-helper', action="store_true",
4701 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004702 parser.add_option('-o',
4703 '--push-options',
4704 action='append',
4705 default=[],
4706 help='Transmit the given string to the server when '
4707 'performing git push (pass-through). See git-push '
4708 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004709 parser.add_option('--no-add-changeid',
4710 action='store_true',
4711 dest='no_add_changeid',
4712 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004713 parser.add_option('--cherry-pick-stacked',
4714 '--cp',
4715 dest='cherry_pick_stacked',
4716 action='store_true',
4717 help='If parent branch has un-uploaded updates, '
4718 'automatically skip parent branches and just upload '
4719 'the current branch cherry-pick on its parent\'s last '
4720 'uploaded commit. Allows users to skip the potential '
4721 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004722 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004723
rmistry@google.com2dd99862015-06-22 12:22:18 +00004724 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004725 (options, args) = parser.parse_args(args)
4726
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004727 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004728 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4729 if opt.help != optparse.SUPPRESS_HELP))
4730 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004731
Aravind Vasudevanb8164182023-08-25 21:49:12 +00004732 # TODO(crbug.com/1475405): Warn users if the project uses submodules and
4733 # they have fsmonitor enabled.
4734 if os.path.isfile('.gitmodules'):
4735 git_common.warn_submodule()
4736
sbc@chromium.org71437c02015-04-09 19:29:40 +00004737 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004738 return 1
4739
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004740 options.reviewers = cleanup_list(options.reviewers)
4741 options.cc = cleanup_list(options.cc)
4742
Josipe827b0f2020-01-30 00:07:20 +00004743 if options.edit_description and options.force:
4744 parser.error('Only one of --force and --edit-description allowed')
4745
tandriib80458a2016-06-23 12:20:07 -07004746 if options.message_file:
4747 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004748 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004749 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004750
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004751 if ([options.cq_dry_run,
4752 options.use_commit_queue,
4753 options.retry_failed].count(True) > 1):
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00004754 parser.error('Only one of --use-commit-queue, --cq-dry-run or '
4755 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004756
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004757 if options.skip_title and options.title:
4758 parser.error('Only one of --title and --skip-title allowed.')
4759
Aaron Gableedbc4132017-09-11 13:22:28 -07004760 if options.use_commit_queue:
4761 options.send_mail = True
4762
Edward Lesmes0dd54822020-03-26 18:24:25 +00004763 if options.squash is None:
4764 # Load default for user, repo, squash=true, in this order.
4765 options.squash = settings.GetSquashGerritUploads()
4766
Joanna Wang5051ffe2023-03-01 22:24:07 +00004767 cl = Changelist(branchref=options.target_branch)
4768
4769 # Warm change details cache now to avoid RPCs later, reducing latency for
4770 # developers.
4771 if cl.GetIssue():
4772 cl._GetChangeDetail(
4773 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4774
4775 if options.retry_failed and not cl.GetIssue():
4776 print('No previous patchsets, so --retry-failed has no effect.')
4777 options.retry_failed = False
4778
Joanna Wang5051ffe2023-03-01 22:24:07 +00004779
Joanna Wang4786a412023-05-16 18:23:08 +00004780 disable_dogfood_stacked_changes = os.environ.get(
4781 DOGFOOD_STACKED_CHANGES_VAR) == '0'
4782 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'
4783
4784 # Only print message for folks who don't have DOGFOOD_STACKED_CHANGES set
4785 # to an expected value.
4786 if (options.squash and not dogfood_stacked_changes
4787 and not disable_dogfood_stacked_changes):
Joanna Wang1398e4f2023-05-01 18:49:13 +00004788 print(
4789 'This repo has been enrolled in the stacked changes dogfood.\n'
4790 '`git cl upload` now uploads the current branch and all upstream '
4791 'branches that have un-uploaded updates.\n'
4792 'Patches can now be reapplied with --force:\n'
4793 '`git cl patch --reapply --force`.\n'
4794 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
Joanna Wang4786a412023-05-16 18:23:08 +00004795 '\n'
4796 'Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4797 '"Set new changes to "work in progress" by default" checkbox at\n'
4798 'https://<host>-review.googlesource.com/settings/\n'
4799 '\n'
4800 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.\n'
4801 'To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004802 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004803
Joanna Wang4786a412023-05-16 18:23:08 +00004804 if options.squash and not disable_dogfood_stacked_changes:
Joanna Wangdd12deb2023-01-26 20:43:28 +00004805 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004806 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004807
Joanna Wangd75fc882023-03-01 21:53:34 +00004808 if options.cherry_pick_stacked:
4809 try:
4810 orig_args.remove('--cherry-pick-stacked')
4811 except ValueError:
4812 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004813 UploadAllSquashed(options, orig_args)
4814 return 0
4815
Joanna Wangd75fc882023-03-01 21:53:34 +00004816 if options.cherry_pick_stacked:
4817 parser.error('--cherry-pick-stacked is not available for this workflow.')
4818
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004819 # cl.GetMostRecentPatchset uses cached information, and can return the last
4820 # patchset before upload. Calling it here makes it clear that it's the
4821 # last patchset before upload. Note that GetMostRecentPatchset will fail
4822 # if no CL has been uploaded yet.
4823 if options.retry_failed:
4824 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004825
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004826 ret = cl.CMDUpload(options, args, orig_args)
4827
4828 if options.retry_failed:
4829 if ret != 0:
4830 print('Upload failed, so --retry-failed has no effect.')
4831 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004832 builds, _ = _fetch_latest_builds(cl,
4833 DEFAULT_BUILDBUCKET_HOST,
4834 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004835 jobs = _filter_failed_for_retry(builds)
4836 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004837 print('No failed tryjobs, so --retry-failed has no effect.')
4838 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004839 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004840
4841 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004842
4843
Joanna Wang18de1f62023-01-21 01:24:24 +00004844def UploadAllSquashed(options, orig_args):
4845 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4846 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004847 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004848
Joanna Wangc710e2d2023-01-25 14:53:22 +00004849 # Create commits.
4850 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4851 if cherry_pick_current:
4852 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4853 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4854 uploads_by_cl.append((cls[0], new_upload))
4855 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004856 ordered_cls = list(reversed(cls))
4857
Joanna Wang6215dd02023-02-07 15:58:03 +00004858 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004859 # We can only support external changes when we're only uploading one
4860 # branch.
4861 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004862 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004863 if parent is None:
4864 origin = '.'
4865 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004866
Joanna Wang7603f042023-03-01 22:17:36 +00004867 while origin == '.':
4868 # Search for cl's closest ancestor with a gerrit hash.
4869 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4870 if origin == '.':
4871 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4872
4873 # Support the `git merge` and `git pull` workflow.
4874 if upstream_branch in ['master', 'main']:
4875 parent = cl.GetCommonAncestorWithUpstream()
4876 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004877 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4878 upstream_branch,
4879 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004880 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4881 upstream_branch,
4882 GERRIT_SQUASH_HASH_CONFIG_KEY)
4883 if parent:
4884 break
4885 branch = upstream_branch
4886 else:
4887 # Either the root of the tree is the cl's direct parent and the while
4888 # loop above only found empty branches between cl and the root of the
4889 # tree.
4890 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004891
Joanna Wang05b60342023-03-29 20:25:57 +00004892 if orig_parent is None:
4893 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004894 for i, cl in enumerate(ordered_cls):
4895 # If we're in the middle of the stack, set end_commit to downstream's
4896 # direct ancestor.
4897 if i + 1 < len(ordered_cls):
4898 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4899 else:
4900 child_base_commit = None
4901 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004902 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004903 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004904 end_commit=child_base_commit)
4905 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004906 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004907 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004908
4909 # Create refspec options
4910 cl, new_upload = uploads_by_cl[-1]
4911 refspec_opts = cl._GetRefSpecOptions(
4912 options,
4913 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004914 multi_change_upload=len(uploads_by_cl) > 1,
4915 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004916 refspec_suffix = ''
4917 if refspec_opts:
4918 refspec_suffix = '%' + ','.join(refspec_opts)
4919 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4920 refspec_suffix)
4921
4922 remote, remote_branch = cl.GetRemoteBranch()
4923 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4924 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4925 refspec_suffix)
4926
4927 # Git push
4928 git_push_metadata = {
4929 'gerrit_host':
4930 cl.GetGerritHost(),
4931 'title':
4932 options.title or '<untitled>',
4933 'change_id':
4934 git_footers.get_footer_change_id(new_upload.change_desc.description),
4935 'description':
4936 new_upload.change_desc.description,
4937 }
4938 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004939 git_push_metadata,
4940 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004941
4942 # Post push updates
4943 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4944 change_numbers = [
4945 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4946 ]
4947
4948 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4949 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4950
4951 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004952
4953
4954def _UploadAllPrecheck(options, orig_args):
4955 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4956 """Checks the state of the tree and gives the user uploading options
4957
4958 Returns: A tuple of the ordered list of changes that have new commits
4959 since their last upload and a boolean of whether the user wants to
4960 cherry-pick and upload the current branch instead of uploading all cls.
4961 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004962 cl = Changelist()
4963 if cl.GetBranch() is None:
4964 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4965
Joanna Wang18de1f62023-01-21 01:24:24 +00004966 branch_ref = None
4967 cls = []
4968 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004969 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004970
4971 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4972
4973 while True:
4974 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4975 DieWithError(
4976 'More than %s branches in the stack have not been uploaded.\n'
4977 'Are your branches in a misconfigured state?\n'
4978 'If not, please upload some upstream changes first.' %
4979 (_MAX_STACKED_BRANCHES_UPLOAD))
4980
4981 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004982
Joanna Wang6215dd02023-02-07 15:58:03 +00004983 # Only add CL if it has anything to commit.
4984 base_commit = cl.GetCommonAncestorWithUpstream()
4985 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4986
4987 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4988 if diff:
4989 cls.append(cl)
4990 if (not first_pass and
4991 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4992 # We are mid-stack and the user must upload their upstream branches.
4993 must_upload_upstream = True
4994 elif first_pass: # The current branch has nothing to commit. Exit.
4995 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4996 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4997 first_pass = False
4998
4999 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005000 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005001 branch_ref = upstream_branch_ref # set branch for next run.
5002
Joanna Wang6215dd02023-02-07 15:58:03 +00005003 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5004 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5005 upstream_branch,
5006 LAST_UPLOAD_HASH_CONFIG_KEY)
5007
Joanna Wang18de1f62023-01-21 01:24:24 +00005008 # Case 1: We've reached the beginning of the tree.
5009 if origin != '.':
5010 break
5011
Joanna Wang18de1f62023-01-21 01:24:24 +00005012 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005013 # the user MUST upload them unless they are empty. Continue to
5014 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005016 continue
5017
Joanna Wang18de1f62023-01-21 01:24:24 +00005018 # Case 3: If upstream's last_upload == cl.base_commit we do
5019 # not need to upload any more upstreams from this point on.
5020 # (Even if there may be diverged branches higher up the tree)
5021 if base_commit == upstream_last_upload:
5022 break
5023
5024 # Case 4: If upstream's last_upload < cl.base_commit we are
5025 # uploading cl and upstream_cl.
5026 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005027 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005028 continue
5029
5030 # Case 5: If cl.base_commit < upstream's last_upload the user
5031 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005032 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005033 DieWithError(
5034 'At least one branch in the stack has diverged from its upstream '
5035 'branch and does not contain its upstream\'s last upload.\n'
5036 'Please rebase the stack with `git rebase-update` before uploading.')
5037
5038 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5039 # any relation to commits in the tree. Continue up the tree until we hit
5040 # the root.
5041
5042 # We assume all cls in the stack have the same auth requirements and only
5043 # check this once.
5044 cls[0].EnsureAuthenticated(force=options.force)
5045
5046 cherry_pick = False
5047 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005048 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005049 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005050 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005051 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005052 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005053 msg = ('At least one parent branch in `%s` has never been uploaded '
5054 'and must be uploaded before/with `%s`.\n' %
5055 (branches, cls[1].branch))
5056 if options.cherry_pick_stacked:
5057 DieWithError(msg)
5058 if not options.force:
5059 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005060 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005061 if options.cherry_pick_stacked:
5062 print('cherry-picking `%s` on %s\'s last upload' %
5063 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005064 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005065 elif not options.force:
5066 answer = gclient_utils.AskForData(
5067 '\n' + opt_message +
5068 'Press enter to update branches %s.\nOr type `n` to upload only '
5069 '`%s` cherry-picked on %s\'s last upload:' %
5070 (branches, cls[0].branch, cls[1].branch))
5071 if answer.lower() == 'n':
5072 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005073 return cls, cherry_pick
5074
5075
Francois Dorayd42c6812017-05-30 15:10:20 -04005076@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005077@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005078def CMDsplit(parser, args):
5079 """Splits a branch into smaller branches and uploads CLs.
5080
5081 Creates a branch and uploads a CL for each group of files modified in the
5082 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005083 comment, the string '$directory', is replaced with the directory containing
5084 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005085 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005086 parser.add_option('-d', '--description', dest='description_file',
5087 help='A text file containing a CL description in which '
5088 '$directory will be replaced by each CL\'s directory.')
5089 parser.add_option('-c', '--comment', dest='comment_file',
5090 help='A text file containing a CL comment.')
5091 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005092 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005093 help='List the files and reviewers for each CL that would '
5094 'be created, but don\'t create branches or CLs.')
5095 parser.add_option('--cq-dry-run', action='store_true',
5096 help='If set, will do a cq dry run for each uploaded CL. '
5097 'Please be careful when doing this; more than ~10 CLs '
5098 'has the potential to overload our build '
5099 'infrastructure. Try to upload these not during high '
5100 'load times (usually 11-3 Mountain View time). Email '
5101 'infra-dev@chromium.org with any questions.')
Anne Redulla072d06e2023-07-06 23:12:16 +00005102 parser.add_option('-a',
5103 '--enable-auto-submit',
5104 action='store_true',
5105 dest='enable_auto_submit',
Takuto Ikuta51eca592019-02-14 19:40:52 +00005106 default=True,
5107 help='Sends your change to the CQ after an approval. Only '
Anne Redulla072d06e2023-07-06 23:12:16 +00005108 'works on repos that have the Auto-Submit label '
5109 'enabled')
5110 parser.add_option('--disable-auto-submit',
5111 action='store_false',
5112 dest='enable_auto_submit',
5113 help='Disables automatic sending of the changes to the CQ '
5114 'after approval. Note that auto-submit only works for '
5115 'repos that have the Auto-Submit label enabled.')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005116 parser.add_option('--max-depth',
5117 type='int',
5118 default=0,
5119 help='The max depth to look for OWNERS files. Useful for '
5120 'controlling the granularity of the split CLs, e.g. '
5121 '--max-depth=1 will only split by top-level '
5122 'directory. Specifying a value less than 1 means no '
5123 'limit on max depth.')
Rachael Newitt03e49122023-06-28 21:39:21 +00005124 parser.add_option('--topic',
5125 default=None,
5126 help='Topic to specify when uploading')
Francois Dorayd42c6812017-05-30 15:10:20 -04005127 options, _ = parser.parse_args(args)
5128
5129 if not options.description_file:
5130 parser.error('No --description flag specified.')
5131
5132 def WrappedCMDupload(args):
5133 return CMDupload(OptionParser(), args)
5134
Daniel Cheng403c44e2022-10-05 22:24:58 +00005135 return split_cl.SplitCl(options.description_file, options.comment_file,
5136 Changelist, WrappedCMDupload, options.dry_run,
5137 options.cq_dry_run, options.enable_auto_submit,
Rachael Newitt03e49122023-06-28 21:39:21 +00005138 options.max_depth, options.topic, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005139
5140
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005141@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005142@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005143def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005144 """DEPRECATED: Used to commit the current changelist via git-svn."""
5145 message = ('git-cl no longer supports committing to SVN repositories via '
5146 'git-svn. You probably want to use `git cl land` instead.')
5147 print(message)
5148 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005149
5150
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005151@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005152@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005153def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005154 """Commits the current changelist via git.
5155
5156 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5157 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005158 """
5159 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5160 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005161 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005162 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005163 parser.add_option('--parallel', action='store_true',
5164 help='Run all tests specified by input_api.RunTests in all '
5165 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005166 parser.add_option('--resultdb', action='store_true',
5167 help='Run presubmit checks in the ResultSink environment '
5168 'and send results to the ResultDB database.')
5169 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005170 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005171
Edward Lemur934836a2019-09-09 20:16:54 +00005172 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173
Robert Iannucci2e73d432018-03-14 01:10:47 -07005174 if not cl.GetIssue():
5175 DieWithError('You must upload the change first to Gerrit.\n'
5176 ' If you would rather have `git cl land` upload '
5177 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005178 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5179 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180
5181
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005182@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005183@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005184def CMDpatch(parser, args):
Victor Hugo Vianna Silvadeff9a22023-07-11 18:07:18 +00005185 """Applies (cherry-picks) a Gerrit changelist locally."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005186 parser.add_option('-b', dest='newbranch',
5187 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005188 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005189 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005190 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005191 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005192
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005193 group = optparse.OptionGroup(
5194 parser,
5195 'Options for continuing work on the current issue uploaded from a '
5196 'different clone (e.g. different machine). Must be used independently '
5197 'from the other options. No issue number should be specified, and the '
5198 'branch must have an issue number associated with it')
5199 group.add_option('--reapply', action='store_true', dest='reapply',
5200 help='Reset the branch and reapply the issue.\n'
5201 'CAUTION: This will undo any local changes in this '
5202 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005203
5204 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005205 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005206 parser.add_option_group(group)
5207
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005209
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005210 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005211 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005212 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005213 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005214 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005215
Edward Lemur934836a2019-09-09 20:16:54 +00005216 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005217 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005218 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005219
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005220 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005221 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005222 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005223
5224 RunGit(['reset', '--hard', upstream])
5225 if options.pull:
5226 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005227
Edward Lemur678a6842019-10-03 22:25:05 +00005228 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005229 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5230 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005231
5232 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005233 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005234
Edward Lemurf38bc172019-09-03 21:02:13 +00005235 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005236 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005237 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005238
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005239 # We don't want uncommitted changes mixed up with the patch.
5240 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005241 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005242
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005243 if options.newbranch:
5244 if options.force:
5245 RunGit(['branch', '-D', options.newbranch],
5246 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005247 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005248
Edward Lemur678a6842019-10-03 22:25:05 +00005249 cl = Changelist(
5250 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005251
Edward Lemur678a6842019-10-03 22:25:05 +00005252 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005253 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005254
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005255 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5256 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005257
5258
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005259def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260 """Fetches the tree status and returns either 'open', 'closed',
5261 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005262 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005264 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265 if status.find('closed') != -1 or status == '0':
5266 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005267
5268 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005269 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005270
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272 return 'unset'
5273
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005274
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005275def GetTreeStatusReason():
5276 """Fetches the tree status from a json url and returns the message
5277 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005278 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005279 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005280 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005281 status = json.loads(connection.read())
5282 connection.close()
5283 return status['message']
5284
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005285
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005286@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005288 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005289 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290 status = GetTreeStatus()
5291 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005292 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293 return 2
5294
vapiera7fbd5a2016-06-16 09:17:49 -07005295 print('The tree is %s' % status)
5296 print()
5297 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005298 if status != 'open':
5299 return 1
5300 return 0
5301
5302
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005303@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005304def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005305 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5306 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005307 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005308 '-b', '--bot', action='append',
5309 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5310 'times to specify multiple builders. ex: '
5311 '"-b win_rel -b win_layout". See '
5312 'the try server waterfall for the builders name and the tests '
5313 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005314 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005315 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005316 help=('Buildbucket bucket to send the try requests. Format: '
5317 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005318 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005319 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005320 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005321 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005322 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005323 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005324 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005325 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005326 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005327 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005328 '--category', default='git_cl_try', help='Specify custom build category.')
5329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005330 '--project',
5331 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005332 'in recipe to determine to which repository or directory to '
5333 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005334 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005335 '-p', '--property', dest='properties', action='append', default=[],
5336 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005337 'key2=value2 etc. The value will be treated as '
5338 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005339 'NOTE: using this may make your tryjob not usable for CQ, '
5340 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005341 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005342 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5343 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005344 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005345 parser.add_option(
5346 '-R', '--retry-failed', action='store_true', default=False,
5347 help='Retry failed jobs from the latest set of tryjobs. '
5348 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005349 parser.add_option(
5350 '-i', '--issue', type=int,
5351 help='Operate on this issue instead of the current branch\'s implicit '
5352 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005353 options, args = parser.parse_args(args)
5354
machenbach@chromium.org45453142015-09-15 08:45:22 +00005355 # Make sure that all properties are prop=value pairs.
5356 bad_params = [x for x in options.properties if '=' not in x]
5357 if bad_params:
5358 parser.error('Got properties with missing "=": %s' % bad_params)
5359
maruel@chromium.org15192402012-09-06 12:38:29 +00005360 if args:
5361 parser.error('Unknown arguments: %s' % args)
5362
Edward Lemur934836a2019-09-09 20:16:54 +00005363 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005364 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005365 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005366
Edward Lemurf38bc172019-09-03 21:02:13 +00005367 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005368 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005369
tandriie113dfd2016-10-11 10:20:12 -07005370 error_message = cl.CannotTriggerTryJobReason()
5371 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005372 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005373
Edward Lemur45768512020-03-02 19:03:14 +00005374 if options.bot:
5375 if options.retry_failed:
5376 parser.error('--bot is not compatible with --retry-failed.')
5377 if not options.bucket:
5378 parser.error('A bucket (e.g. "chromium/try") is required.')
5379
5380 triggered = [b for b in options.bot if 'triggered' in b]
5381 if triggered:
5382 parser.error(
5383 'Cannot schedule builds on triggered bots: %s.\n'
5384 'This type of bot requires an initial job from a parent (usually a '
5385 'builder). Schedule a job on the parent instead.\n' % triggered)
5386
5387 if options.bucket.startswith('.master'):
5388 parser.error('Buildbot masters are not supported.')
5389
5390 project, bucket = _parse_bucket(options.bucket)
5391 if project is None or bucket is None:
5392 parser.error('Invalid bucket: %s.' % options.bucket)
5393 jobs = sorted((project, bucket, bot) for bot in options.bot)
5394 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005395 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005396 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005397 if options.verbose:
5398 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005399 jobs = _filter_failed_for_retry(builds)
5400 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005401 print('There are no failed jobs in the latest set of jobs '
5402 '(patchset #%d), doing nothing.' % patchset)
5403 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005404 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005405 if num_builders > 10:
5406 confirm_or_exit('There are %d builders with failed builds.'
5407 % num_builders, action='continue')
5408 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005409 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005410 print('git cl try with no bots now defaults to CQ dry run.')
5411 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5412 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005413
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005414 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005415 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005416 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005417 except BuildbucketResponseException as ex:
5418 print('ERROR: %s' % ex)
5419 return 1
5420 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005421
5422
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005423@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005424def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005425 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005426 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005427 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005428 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005430 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005431 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005432 '--color', action='store_true', default=setup_color.IS_TTY,
5433 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005434 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005435 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5436 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005437 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005438 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005439 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005440 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005441 parser.add_option(
5442 '-i', '--issue', type=int,
5443 help='Operate on this issue instead of the current branch\'s implicit '
5444 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005445 options, args = parser.parse_args(args)
5446 if args:
5447 parser.error('Unrecognized args: %s' % ' '.join(args))
5448
Edward Lemur934836a2019-09-09 20:16:54 +00005449 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005450 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005451 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452
tandrii221ab252016-10-06 08:12:04 -07005453 patchset = options.patchset
5454 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005455 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005456 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005457 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005458 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005459 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005460 cl.GetIssue())
5461
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005462 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005463 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005464 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005465 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005466 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005467 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005468 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005469 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005470 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005471 return 0
5472
5473
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005474@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005475@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005476def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005477 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005478 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005479 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005480 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005481
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005482 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005483 if args:
5484 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005485 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005486 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005487 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005489
5490 # Clear configured merge-base, if there is one.
5491 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005492 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005493 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005494 return 0
5495
5496
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005497@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005498def CMDweb(parser, args):
5499 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005500 parser.add_option('-p',
5501 '--print-only',
5502 action='store_true',
5503 dest='print_only',
5504 help='Only print the Gerrit URL, don\'t open it in the '
5505 'browser.')
5506 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005507 if args:
5508 parser.error('Unrecognized args: %s' % ' '.join(args))
5509
5510 issue_url = Changelist().GetIssueURL()
5511 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005512 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005513 return 1
5514
Orr Bernstein0b960582022-12-22 20:16:18 +00005515 if options.print_only:
5516 print(issue_url)
5517 return 0
5518
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005519 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005520 # allows us to hide the "Created new window in existing browser session."
5521 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005522 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005523 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005524 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005525 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005526 os.open(os.devnull, os.O_RDWR)
5527 try:
5528 webbrowser.open(issue_url)
5529 finally:
5530 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005531 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005532 return 0
5533
5534
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005535@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005536def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005537 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005538 parser.add_option('-d', '--dry-run', action='store_true',
5539 help='trigger in dry run mode')
5540 parser.add_option('-c', '--clear', action='store_true',
5541 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005542 parser.add_option(
5543 '-i', '--issue', type=int,
5544 help='Operate on this issue instead of the current branch\'s implicit '
5545 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005546 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005547 if args:
5548 parser.error('Unrecognized args: %s' % ' '.join(args))
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00005549 if [options.dry_run, options.clear].count(True) > 1:
5550 parser.error('Only one of --dry-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005551
Edward Lemur934836a2019-09-09 20:16:54 +00005552 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005553 if not cl.GetIssue():
5554 parser.error('Must upload the issue first.')
5555
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005556 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005557 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005558 elif options.dry_run:
5559 state = _CQState.DRY_RUN
5560 else:
5561 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005562 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005563 return 0
5564
5565
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005566@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005567def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005568 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005569 parser.add_option(
5570 '-i', '--issue', type=int,
5571 help='Operate on this issue instead of the current branch\'s implicit '
5572 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005573 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005574 if args:
5575 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005576 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005577 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005578 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005579 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005580 cl.CloseIssue()
5581 return 0
5582
5583
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005584@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005585def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005586 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005587 parser.add_option(
5588 '--stat',
5589 action='store_true',
5590 dest='stat',
5591 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005592 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005593 if args:
5594 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005595
Edward Lemur934836a2019-09-09 20:16:54 +00005596 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005597 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005598 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005599 if not issue:
5600 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005601
Gavin Makbe2e9262022-11-08 23:41:55 +00005602 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005603 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005604 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005605 if not base:
5606 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5607 revision_info = detail['revisions'][detail['current_revision']]
5608 fetch_info = revision_info['fetch']['http']
5609 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5610 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005611
Aaron Gablea718c3e2017-08-28 17:47:28 -07005612 cmd = ['git', 'diff']
5613 if options.stat:
5614 cmd.append('--stat')
5615 cmd.append(base)
5616 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005617
5618 return 0
5619
5620
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005621@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005622def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005623 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005624 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005625 '--ignore-current',
5626 action='store_true',
5627 help='Ignore the CL\'s current reviewers and start from scratch.')
5628 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005629 '--ignore-self',
5630 action='store_true',
5631 help='Do not consider CL\'s author as an owners.')
5632 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005633 '--no-color',
5634 action='store_true',
5635 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005636 parser.add_option(
5637 '--batch',
5638 action='store_true',
5639 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005640 # TODO: Consider moving this to another command, since other
5641 # git-cl owners commands deal with owners for a given CL.
5642 parser.add_option(
5643 '--show-all',
5644 action='store_true',
5645 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005646 options, args = parser.parse_args(args)
5647
Edward Lemur934836a2019-09-09 20:16:54 +00005648 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005649 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005650
Yang Guo6e269a02019-06-26 11:17:02 +00005651 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005652 if len(args) == 0:
5653 print('No files specified for --show-all. Nothing to do.')
5654 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005655 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005656 for path in args:
5657 print('Owners for %s:' % path)
5658 print('\n'.join(
5659 ' - %s' % owner
5660 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005661 return 0
5662
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005663 if args:
5664 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005665 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005666 base_branch = args[0]
5667 else:
5668 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005669 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005670
Edward Lemur2c62b332020-03-12 22:12:33 +00005671 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005672
5673 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005674 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5675 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005676 return 0
5677
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005678 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005679 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005680 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005681 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005682 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005683 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005684 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005685
5686
Aiden Bennerc08566e2018-10-03 17:52:42 +00005687def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005688 """Generates a diff command."""
5689 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005690 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5691
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005692 if allow_prefix:
5693 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5694 # case that diff.noprefix is set in the user's git config.
5695 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5696 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005697 diff_cmd += ['--no-prefix']
5698
5699 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005700
5701 if args:
5702 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005703 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005704 diff_cmd.append(arg)
5705 else:
5706 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005707
5708 return diff_cmd
5709
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005710
Jamie Madill5e96ad12020-01-13 16:08:35 +00005711def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5712 """Runs clang-format-diff and sets a return value if necessary."""
5713
5714 if not clang_diff_files:
5715 return 0
5716
5717 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5718 # formatted. This is used to block during the presubmit.
5719 return_value = 0
5720
5721 # Locate the clang-format binary in the checkout
5722 try:
5723 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5724 except clang_format.NotFoundError as e:
5725 DieWithError(e)
5726
5727 if opts.full or settings.GetFormatFullByDefault():
5728 cmd = [clang_format_tool]
5729 if not opts.dry_run and not opts.diff:
5730 cmd.append('-i')
5731 if opts.dry_run:
5732 for diff_file in clang_diff_files:
5733 with open(diff_file, 'r') as myfile:
5734 code = myfile.read().replace('\r\n', '\n')
5735 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5736 stdout = stdout.replace('\r\n', '\n')
5737 if opts.diff:
5738 sys.stdout.write(stdout)
5739 if code != stdout:
5740 return_value = 2
5741 else:
5742 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5743 if opts.diff:
5744 sys.stdout.write(stdout)
5745 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005746 try:
5747 script = clang_format.FindClangFormatScriptInChromiumTree(
5748 'clang-format-diff.py')
5749 except clang_format.NotFoundError as e:
5750 DieWithError(e)
5751
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005752 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005753 if not opts.dry_run and not opts.diff:
5754 cmd.append('-i')
5755
5756 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005757 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005758
Edward Lesmes89624cd2020-04-06 17:51:56 +00005759 env = os.environ.copy()
5760 env['PATH'] = (
5761 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5762 stdout = RunCommand(
5763 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005764 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005765 if opts.diff:
5766 sys.stdout.write(stdout)
5767 if opts.dry_run and len(stdout) > 0:
5768 return_value = 2
5769
5770 return return_value
5771
5772
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005773def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5774 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5775 presubmit checks have failed (and returns 0 otherwise)."""
5776
5777 if not rust_diff_files:
5778 return 0
5779
5780 # Locate the rustfmt binary.
5781 try:
5782 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5783 except rustfmt.NotFoundError as e:
5784 DieWithError(e)
5785
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005786 # TODO(crbug.com/1440869): Support formatting only the changed lines
5787 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005788 cmd = [rustfmt_tool]
5789 if opts.dry_run:
5790 cmd.append('--check')
5791 cmd += rust_diff_files
5792 rustfmt_exitcode = subprocess2.call(cmd)
5793
5794 if opts.presubmit and rustfmt_exitcode != 0:
5795 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005796
5797 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005798
5799
Olivier Robin0a6b5442022-04-07 07:25:04 +00005800def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5801 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5802 that presubmit checks have failed (and returns 0 otherwise)."""
5803
5804 if not swift_diff_files:
5805 return 0
5806
5807 # Locate the swift-format binary.
5808 try:
5809 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5810 except swift_format.NotFoundError as e:
5811 DieWithError(e)
5812
5813 cmd = [swift_format_tool]
5814 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005815 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005816 else:
5817 cmd += ['format', '-i']
5818 cmd += swift_diff_files
5819 swift_format_exitcode = subprocess2.call(cmd)
5820
5821 if opts.presubmit and swift_format_exitcode != 0:
5822 return 2
5823
5824 return 0
5825
5826
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005827def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005828 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005829 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005830
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005831
enne@chromium.org555cfe42014-01-29 18:21:39 +00005832@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005833@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005834def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005835 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005836 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005837 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005838 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005839 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005840 parser.add_option('--full', action='store_true',
5841 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005842 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005843 parser.add_option('--dry-run', action='store_true',
5844 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005845 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005846 '--no-clang-format',
5847 dest='clang_format',
5848 action='store_false',
5849 default=True,
5850 help='Disables formatting of various file types using clang-format.')
5851 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005852 '--python',
5853 action='store_true',
5854 default=None,
5855 help='Enables python formatting on all python files.')
5856 parser.add_option(
5857 '--no-python',
5858 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005859 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005860 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005861 'If neither --python or --no-python are set, python files that have a '
5862 '.style.yapf file in an ancestor directory will be formatted. '
5863 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005864 parser.add_option(
5865 '--js',
5866 action='store_true',
5867 help='Format javascript code with clang-format. '
5868 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005869 parser.add_option('--diff', action='store_true',
5870 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005871 parser.add_option('--presubmit', action='store_true',
5872 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005873
5874 parser.add_option('--rust-fmt',
5875 dest='use_rust_fmt',
5876 action='store_true',
5877 default=rustfmt.IsRustfmtSupported(),
5878 help='Enables formatting of Rust file types using rustfmt.')
5879 parser.add_option(
5880 '--no-rust-fmt',
5881 dest='use_rust_fmt',
5882 action='store_false',
5883 help='Disables formatting of Rust file types using rustfmt.')
5884
Olivier Robin0a6b5442022-04-07 07:25:04 +00005885 parser.add_option(
5886 '--swift-format',
5887 dest='use_swift_format',
5888 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005889 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005890 help='Enables formatting of Swift file types using swift-format '
5891 '(macOS host only).')
5892 parser.add_option(
5893 '--no-swift-format',
5894 dest='use_swift_format',
5895 action='store_false',
5896 help='Disables formatting of Swift file types using swift-format.')
5897
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005898 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005899
Garrett Beaty91a6f332020-01-06 16:57:24 +00005900 if opts.python is not None and opts.no_python:
5901 raise parser.error('Cannot set both --python and --no-python')
5902 if opts.no_python:
5903 opts.python = False
5904
Daniel Chengc55eecf2016-12-30 03:11:02 -08005905 # Normalize any remaining args against the current path, so paths relative to
5906 # the current directory are still resolved as expected.
5907 args = [os.path.join(os.getcwd(), arg) for arg in args]
5908
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005909 # git diff generates paths against the root of the repository. Change
5910 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005911 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005912 if rel_base_path:
5913 os.chdir(rel_base_path)
5914
digit@chromium.org29e47272013-05-17 17:01:46 +00005915 # Grab the merge-base commit, i.e. the upstream commit of the current
5916 # branch when it was created or the last time it was rebased. This is
5917 # to cover the case where the user may have called "git fetch origin",
5918 # moving the origin branch to a newer commit, but hasn't rebased yet.
5919 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005920 upstream_branch = opts.upstream
5921 if not upstream_branch:
5922 cl = Changelist()
5923 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005924 if upstream_branch:
5925 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5926 upstream_commit = upstream_commit.strip()
5927
5928 if not upstream_commit:
5929 DieWithError('Could not find base commit for this branch. '
5930 'Are you in detached state?')
5931
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005932 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5933 diff_output = RunGit(changed_files_cmd)
5934 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005935 # Filter out files deleted by this CL
5936 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005937
Andreas Haas417d89c2020-02-06 10:24:27 +00005938 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005939 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005940
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005941 clang_diff_files = []
5942 if opts.clang_format:
5943 clang_diff_files = [
5944 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5945 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005946 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005947 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005948 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005949 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005950
Edward Lesmes50da7702020-03-30 19:23:43 +00005951 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005952
Jamie Madill5e96ad12020-01-13 16:08:35 +00005953 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5954 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005955
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005956 if opts.use_rust_fmt:
5957 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5958 upstream_commit)
5959 if rust_fmt_return_value == 2:
5960 return_value = 2
5961
Olivier Robin0a6b5442022-04-07 07:25:04 +00005962 if opts.use_swift_format:
5963 if sys.platform != 'darwin':
5964 DieWithError('swift-format is only supported on macOS.')
5965 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5966 upstream_commit)
5967 if swift_format_return_value == 2:
5968 return_value = 2
5969
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005970 # Similar code to above, but using yapf on .py files rather than clang-format
5971 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005972 py_explicitly_disabled = opts.python is not None and not opts.python
5973 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005974 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5975 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005976
Aiden Bennerc08566e2018-10-03 17:52:42 +00005977 # Used for caching.
5978 yapf_configs = {}
5979 for f in python_diff_files:
5980 # Find the yapf style config for the current file, defaults to depot
5981 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005982 _FindYapfConfigFile(f, yapf_configs, top_dir)
5983
5984 # Turn on python formatting by default if a yapf config is specified.
5985 # This breaks in the case of this repo though since the specified
5986 # style file is also the global default.
5987 if opts.python is None:
5988 filtered_py_files = []
5989 for f in python_diff_files:
5990 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5991 filtered_py_files.append(f)
5992 else:
5993 filtered_py_files = python_diff_files
5994
5995 # Note: yapf still seems to fix indentation of the entire file
5996 # even if line ranges are specified.
5997 # See https://github.com/google/yapf/issues/499
5998 if not opts.full and filtered_py_files:
5999 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6000
Brian Sheedyb4307d52019-12-02 19:18:17 +00006001 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6002 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6003 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006004
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006005 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006006 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6007 # Default to pep8 if not .style.yapf is found.
6008 if not yapf_style:
6009 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006010
Peter Wend9399922020-06-17 17:33:49 +00006011 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006012 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006013 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006014 else:
6015 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006016
6017 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006018
6019 has_formattable_lines = False
6020 if not opts.full:
6021 # Only run yapf over changed line ranges.
6022 for diff_start, diff_len in py_line_diffs[f]:
6023 diff_end = diff_start + diff_len - 1
6024 # Yapf errors out if diff_end < diff_start but this
6025 # is a valid line range diff for a removal.
6026 if diff_end >= diff_start:
6027 has_formattable_lines = True
6028 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6029 # If all line diffs were removals we have nothing to format.
6030 if not has_formattable_lines:
6031 continue
6032
6033 if opts.diff or opts.dry_run:
6034 cmd += ['--diff']
6035 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006036 stdout = RunCommand(cmd,
6037 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006038 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006039 cwd=top_dir,
6040 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006041 if opts.diff:
6042 sys.stdout.write(stdout)
6043 elif len(stdout) > 0:
6044 return_value = 2
6045 else:
6046 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006047 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006048
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006049 # Format GN build files. Always run on full build files for canonical form.
6050 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006051 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006052 if opts.dry_run or opts.diff:
6053 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006054 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006055 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006056 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006057 cwd=top_dir)
6058 if opts.dry_run and gn_ret == 2:
6059 return_value = 2 # Not formatted.
6060 elif opts.diff and gn_ret == 2:
6061 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006062 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006063 elif gn_ret != 0:
6064 # For non-dry run cases (and non-2 return values for dry-run), a
6065 # nonzero error code indicates a failure, probably because the file
6066 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006067 DieWithError('gn format failed on ' + gn_diff_file +
6068 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006069
Ilya Shermane081cbe2017-08-15 17:51:04 -07006070 # Skip the metrics formatting from the global presubmit hook. These files have
6071 # a separate presubmit hook that issues an error if the files need formatting,
6072 # whereas the top-level presubmit script merely issues a warning. Formatting
6073 # these files is somewhat slow, so it's important not to duplicate the work.
6074 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006075 for diff_xml in GetDiffXMLs(diff_files):
6076 xml_dir = GetMetricsDir(diff_xml)
6077 if not xml_dir:
6078 continue
6079
Ilya Shermane081cbe2017-08-15 17:51:04 -07006080 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006081 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006082 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006083
6084 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6085 # command as histograms/pretty_print.py now needs a relative path argument
6086 # after splitting the histograms into multiple directories.
6087 # For example, in tools/metrics/ukm, pretty-print could be run using:
6088 # $ python pretty_print.py
6089 # But in tools/metrics/histogrmas, pretty-print should be run with an
6090 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006091 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006092 # $ python pretty_print.py enums.xml
6093
Weilun Shib92c4b72020-08-27 17:45:11 +00006094 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006095 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006096 cmd.append(diff_xml)
6097
Ilya Shermane081cbe2017-08-15 17:51:04 -07006098 if opts.dry_run or opts.diff:
6099 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006100
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006101 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6102 # `shell` param and instead replace `'vpython'` with
6103 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006104 stdout = RunCommand(cmd,
6105 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006106 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006107 if opts.diff:
6108 sys.stdout.write(stdout)
6109 if opts.dry_run and stdout:
6110 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006111
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006112 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006113
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006114
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006115def GetDiffXMLs(diff_files):
6116 return [
6117 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6118 ]
6119
6120
6121def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006122 metrics_xml_dirs = [
6123 os.path.join('tools', 'metrics', 'actions'),
6124 os.path.join('tools', 'metrics', 'histograms'),
6125 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006126 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006127 os.path.join('tools', 'metrics', 'ukm'),
6128 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006129 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006130 if diff_xml.startswith(xml_dir):
6131 return xml_dir
6132 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006133
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006134
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006135@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006136@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006137def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006138 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006139 _, args = parser.parse_args(args)
6140
6141 if len(args) != 1:
6142 parser.print_help()
6143 return 1
6144
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006145 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006146 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006147 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006148
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006149 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006150
Edward Lemur52969c92020-02-06 18:15:28 +00006151 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006152 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006153 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006154
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006155 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006156 for key, issue in [x.split() for x in output.splitlines()]:
6157 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006158 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006159
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006160 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006161 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006162 return 1
6163 if len(branches) == 1:
6164 RunGit(['checkout', branches[0]])
6165 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006166 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006167 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006168 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006169 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006170 try:
6171 RunGit(['checkout', branches[int(which)]])
6172 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006173 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006174 return 1
6175
6176 return 0
6177
6178
maruel@chromium.org29404b52014-09-08 22:58:00 +00006179def CMDlol(parser, args):
6180 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006181 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006182 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6183 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6184 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006185 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006186 return 0
6187
6188
Josip Sokcevic0399e172022-03-21 23:11:51 +00006189def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006190 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006191 print(utils.depot_tools_version())
6192
6193
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006194class OptionParser(optparse.OptionParser):
6195 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006196
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006197 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006198 optparse.OptionParser.__init__(
6199 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006200 self.add_option(
6201 '-v', '--verbose', action='count', default=0,
6202 help='Use 2 times for more debugging info')
6203
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006204 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006205 try:
6206 return self._parse_args(args)
6207 finally:
6208 # Regardless of success or failure of args parsing, we want to report
6209 # metrics, but only after logging has been initialized (if parsing
6210 # succeeded).
6211 global settings
6212 settings = Settings()
6213
Edward Lesmes9c349062021-05-06 20:02:39 +00006214 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006215 try:
6216 # GetViewVCUrl ultimately calls logging method.
6217 project_url = settings.GetViewVCUrl().strip('/+')
6218 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6219 metrics.collector.add('project_urls', [project_url])
6220 except subprocess2.CalledProcessError:
6221 # Occurs when command is not executed in a git repository
6222 # We should not fail here. If the command needs to be executed
6223 # in a repo, it will be raised later.
6224 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006225
6226 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006227 # Create an optparse.Values object that will store only the actual passed
6228 # options, without the defaults.
6229 actual_options = optparse.Values()
6230 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6231 # Create an optparse.Values object with the default options.
6232 options = optparse.Values(self.get_default_values().__dict__)
6233 # Update it with the options passed by the user.
6234 options._update_careful(actual_options.__dict__)
6235 # Store the options passed by the user in an _actual_options attribute.
6236 # We store only the keys, and not the values, since the values can contain
6237 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006238 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006239
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006240 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006241 logging.basicConfig(
6242 level=levels[min(options.verbose, len(levels) - 1)],
6243 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6244 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006245
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006246 return options, args
6247
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006248
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006249def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006250 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006251 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006252 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006253 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006254
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006255 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006256 dispatcher = subcommand.CommandDispatcher(__name__)
6257 try:
6258 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006259 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006260 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006261 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006262 if e.code != 500:
6263 raise
6264 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006265 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006266 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006267 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006268
6269
6270if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006271 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6272 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006273 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006274 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006275 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006276 sys.exit(main(sys.argv[1:]))