blob: e4b3caabfb94cd652dc39668934617774dab1f05 [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
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
thestig@chromium.org44202a22014-03-11 19:22:18 +0000116# Valid extensions for files we want to lint.
117DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
118DEFAULT_LINT_IGNORE_REGEX = r"$^"
119
Aiden Bennerc08566e2018-10-03 17:52:42 +0000120# File name for yapf style config files.
121YAPF_CONFIG_FILENAME = '.style.yapf'
122
Edward Lesmes50da7702020-03-30 19:23:43 +0000123# The issue, patchset and codereview server are stored on git config for each
124# branch under branch.<branch-name>.<config-key>.
125ISSUE_CONFIG_KEY = 'gerritissue'
126PATCHSET_CONFIG_KEY = 'gerritpatchset'
127CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000128# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
129# you make to Gerrit. Instead, it creates a new commit object that contains all
130# changes you've made, diffed against a parent/merge base.
131# This is the hash of the new squashed commit and you can find this on Gerrit.
132GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
133# This is the latest uploaded local commit hash.
134LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000135
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000136# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000137Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139# Initialized in main()
140settings = None
141
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100142# Used by tests/git_cl_test.py to add extra logging.
143# Inside the weirdly failing test, add this:
144# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700145# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100146_IS_BEING_TESTED = False
147
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000148_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000149
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000150_KNOWN_GERRIT_TO_SHORT_URLS = {
151 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
152 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
153}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000154assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
155 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000156
157
Joanna Wang18de1f62023-01-21 01:24:24 +0000158# Maximum number of branches in a stack that can be traversed and uploaded
159# at once. Picked arbitrarily.
160_MAX_STACKED_BRANCHES_UPLOAD = 20
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}
385 batch_response = _call_buildbucket(
386 http, options.buildbucket_host, 'Batch', batch_request)
387
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
Dirk Pranke6f0df682021-06-25 00:42:33 +0000818 def GetUsePython3(self):
819 return self._GetConfig('rietveld.use-python3')
820
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000821 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000822 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000823 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000824 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
825 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000826 # Default is squash now (http://crbug.com/611892#c23).
827 self.squash_gerrit_uploads = self._GetConfig(
828 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000829 return self.squash_gerrit_uploads
830
Edward Lesmes4de54132020-05-05 19:41:33 +0000831 def GetSquashGerritUploadsOverride(self):
832 """Return True or False if codereview.settings should be overridden.
833
834 Returns None if no override has been defined.
835 """
836 # See also http://crbug.com/611892#c23
837 result = self._GetConfig('gerrit.override-squash-uploads').lower()
838 if result == 'true':
839 return True
840 if result == 'false':
841 return False
842 return None
843
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000844 def GetIsGerrit(self):
845 """Return True if gerrit.host is set."""
846 if self.is_gerrit is None:
847 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
848 return self.is_gerrit
849
tandrii@chromium.org28253532016-04-14 13:46:56 +0000850 def GetGerritSkipEnsureAuthenticated(self):
851 """Return True if EnsureAuthenticated should not be done for Gerrit
852 uploads."""
853 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000854 self.gerrit_skip_ensure_authenticated = self._GetConfig(
855 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 return self.gerrit_skip_ensure_authenticated
857
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000858 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000859 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000860 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000861 # Git requires single quotes for paths with spaces. We need to replace
862 # them with double quotes for Windows to treat such paths as a single
863 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000864 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000865 return self.git_editor or None
866
thestig@chromium.org44202a22014-03-11 19:22:18 +0000867 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000868 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000869
870 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000871 return self._GetConfig(
872 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000873
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000874 def GetFormatFullByDefault(self):
875 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000876 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000877 result = (
878 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
879 error_ok=True).strip())
880 self.format_full_by_default = (result == 'true')
881 return self.format_full_by_default
882
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000883 def IsStatusCommitOrderByDate(self):
884 if self.is_status_commit_order_by_date is None:
885 result = (RunGit(['config', '--bool', 'cl.date-order'],
886 error_ok=True).strip())
887 self.is_status_commit_order_by_date = (result == 'true')
888 return self.is_status_commit_order_by_date
889
Edward Lemur26964072020-02-19 19:18:51 +0000890 def _GetConfig(self, key, default=''):
891 self._LazyUpdateIfNeeded()
892 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000893
894
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000895class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000896 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000897 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000898 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000899 DRY_RUN = 'dry_run'
900 COMMIT = 'commit'
901
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000902 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000903
904
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000905class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000906 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000907 self.issue = issue
908 self.patchset = patchset
909 self.hostname = hostname
910
911 @property
912 def valid(self):
913 return self.issue is not None
914
915
Edward Lemurf38bc172019-09-03 21:02:13 +0000916def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000917 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
918 fail_result = _ParsedIssueNumberArgument()
919
Edward Lemur678a6842019-10-03 22:25:05 +0000920 if isinstance(arg, int):
921 return _ParsedIssueNumberArgument(issue=arg)
922 if not isinstance(arg, basestring):
923 return fail_result
924
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000925 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000926 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000929 if not url.startswith('http'):
930 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000931 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
932 if url.startswith(short_url):
933 url = gerrit_url + url[len(short_url):]
934 break
935
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000936 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000937 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000938 except ValueError:
939 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200940
Alex Turner30ae6372022-01-04 02:32:52 +0000941 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
942 # URL.
943 if not arg.startswith('http') and '.' not in parsed_url.netloc:
944 return fail_result
945
Edward Lemur678a6842019-10-03 22:25:05 +0000946 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
947 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
948 # Short urls like https://domain/<issue_number> can be used, but don't allow
949 # specifying the patchset (you'd 404), but we allow that here.
950 if parsed_url.path == '/':
951 part = parsed_url.fragment
952 else:
953 part = parsed_url.path
954
955 match = re.match(
956 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
957 if not match:
958 return fail_result
959
960 issue = int(match.group('issue'))
961 patchset = match.group('patchset')
962 return _ParsedIssueNumberArgument(
963 issue=issue,
964 patchset=int(patchset) if patchset else None,
965 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000966
967
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000968def _create_description_from_log(args):
969 """Pulls out the commit log to use as a base for the CL description."""
970 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000971 if len(args) == 1 and args[0] == None:
972 # Handle the case where None is passed as the branch.
973 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000974 if len(args) == 1 and not args[0].endswith('.'):
975 log_args = [args[0] + '..']
976 elif len(args) == 1 and args[0].endswith('...'):
977 log_args = [args[0][:-1]]
978 elif len(args) == 2:
979 log_args = [args[0] + '..' + args[1]]
980 else:
981 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000982 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000983
984
Aaron Gablea45ee112016-11-22 15:14:38 -0800985class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700986 def __init__(self, issue, url):
987 self.issue = issue
988 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800989 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700990
991 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800992 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700993 self.issue, self.url)
994
995
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100996_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000997 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100998 # TODO(tandrii): these two aren't known in Gerrit.
999 'approval', 'disapproval'])
1000
1001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001002class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001003 """Changelist works with one changelist in local branch.
1004
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001005 Notes:
1006 * Not safe for concurrent multi-{thread,process} use.
1007 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001008 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001009 """
1010
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001011 def __init__(self,
1012 branchref=None,
1013 issue=None,
1014 codereview_host=None,
1015 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001016 """Create a new ChangeList instance.
1017
Edward Lemurf38bc172019-09-03 21:02:13 +00001018 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001020 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001021 global settings
1022 if not settings:
1023 # Happens when git_cl.py is used as a utility library.
1024 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026 self.branchref = branchref
1027 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001028 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001029 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 else:
1031 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001032 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001034 self.lookedup_issue = False
1035 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001037 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001039 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001040 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001041 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001042 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001043
Edward Lemur125d60a2019-09-13 18:25:41 +00001044 # Lazily cached values.
1045 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1046 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001047 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001048 # Map from change number (issue) to its detail cache.
1049 self._detail_cache = {}
1050
1051 if codereview_host is not None:
1052 assert not codereview_host.startswith('https://'), codereview_host
1053 self._gerrit_host = codereview_host
1054 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001055
Edward Lesmese1576912021-02-16 21:53:34 +00001056 @property
1057 def owners_client(self):
1058 if self._owners_client is None:
1059 remote, remote_branch = self.GetRemoteBranch()
1060 branch = GetTargetRef(remote, remote_branch, None)
1061 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001062 host=self.GetGerritHost(),
1063 project=self.GetGerritProject(),
1064 branch=branch)
1065 return self._owners_client
1066
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001067 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001068 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001070 The return value is a string suitable for passing to git cl with the --cc
1071 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001072 """
1073 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001074 base_cc = settings.GetDefaultCCList()
1075 more_cc = ','.join(self.more_cc)
1076 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077 return self.cc
1078
Daniel Cheng7227d212017-11-17 08:12:37 -08001079 def ExtendCC(self, more_cc):
1080 """Extends the list of users to cc on this CL based on the changed files."""
1081 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001083 def GetCommitDate(self):
1084 """Returns the commit date as provided in the constructor"""
1085 return self.commit_date
1086
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001087 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001088 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001090 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001091 if not branchref:
1092 return None
1093 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001094 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001095 return self.branch
1096
1097 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001098 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 self.GetBranch() # Poke the lazy loader.
1100 return self.branchref
1101
Edward Lemur85153282020-02-14 22:06:29 +00001102 def _GitGetBranchConfigValue(self, key, default=None):
1103 return scm.GIT.GetBranchConfig(
1104 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001105
Edward Lemur85153282020-02-14 22:06:29 +00001106 def _GitSetBranchConfigValue(self, key, value):
1107 action = 'set %s to %r' % (key, value)
1108 if not value:
1109 action = 'unset %s' % key
1110 assert self.GetBranch(), 'a branch is needed to ' + action
1111 return scm.GIT.SetBranchConfig(
1112 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001113
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 @staticmethod
1115 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001116 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001117 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001118 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001119 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1120 settings.GetRoot(), branch)
1121 if not remote or not upstream_branch:
1122 DieWithError(
1123 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001124 'Verify this branch is set up to track another \n'
1125 '(via the --track argument to "git checkout -b ..."). \n'
1126 'or pass complete "git diff"-style arguments if supported, like\n'
1127 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128
1129 return remote, upstream_branch
1130
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001131 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001132 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001133 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001134 DieWithError('The upstream for the current branch (%s) does not exist '
1135 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001136 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001137 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001138
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 def GetUpstreamBranch(self):
1140 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001141 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001142 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001143 upstream_branch = upstream_branch.replace('refs/heads/',
1144 'refs/remotes/%s/' % remote)
1145 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1146 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.upstream_branch = upstream_branch
1148 return self.upstream_branch
1149
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001151 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 remote, branch = None, self.GetBranch()
1153 seen_branches = set()
1154 while branch not in seen_branches:
1155 seen_branches.add(branch)
1156 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001157 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 if remote != '.' or branch.startswith('refs/remotes'):
1159 break
1160 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001161 remotes = RunGit(['remote'], error_ok=True).split()
1162 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001164 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001166 logging.warning('Could not determine which remote this change is '
1167 'associated with, so defaulting to "%s".' %
1168 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001169 else:
Gavin Make6a62332020-12-04 21:57:10 +00001170 logging.warning('Could not determine which remote this change is '
1171 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 branch = 'HEAD'
1173 if branch.startswith('refs/remotes'):
1174 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001175 elif branch.startswith('refs/branch-heads/'):
1176 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001177 else:
1178 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 return self._remote
1180
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181 def GetRemoteUrl(self):
1182 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1183
1184 Returns None if there is no remote.
1185 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001186 is_cached, value = self._cached_remote_url
1187 if is_cached:
1188 return value
1189
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001190 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001191 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001192
Edward Lemur298f2cf2019-02-22 21:40:39 +00001193 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001194 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001195 if host:
1196 self._cached_remote_url = (True, url)
1197 return url
1198
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001199 # If it cannot be parsed as an url, assume it is a local directory,
1200 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001201 logging.warning('"%s" doesn\'t appear to point to a git host. '
1202 'Interpreting it as a local directory.', url)
1203 if not os.path.isdir(url):
1204 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001205 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1206 'but it doesn\'t exist.',
1207 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001208 return None
1209
1210 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001211 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001212
Edward Lemur79d4f992019-11-11 23:49:02 +00001213 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001214 if not host:
1215 logging.error(
1216 'Remote "%(remote)s" for branch "%(branch)s" points to '
1217 '"%(cache_path)s", but it is misconfigured.\n'
1218 '"%(cache_path)s" must be a git repo and must have a remote named '
1219 '"%(remote)s" pointing to the git host.', {
1220 'remote': remote,
1221 'cache_path': cache_path,
1222 'branch': self.GetBranch()})
1223 return None
1224
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001225 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001226 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001228 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001229 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001230 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001231 if self.GetBranch():
1232 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001233 if self.issue is not None:
1234 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001235 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236 return self.issue
1237
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001238 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001239 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001240 issue = self.GetIssue()
1241 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001242 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001243 server = self.GetCodereviewServer()
1244 if short:
1245 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1246 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247
Dirk Pranke6f0df682021-06-25 00:42:33 +00001248 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001249 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +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
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001421 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1422 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001423 if py3_results.get('skipped_presubmits', 1) == 0:
1424 print('No more presubmits to run - skipping Python 2 presubmits.')
1425 return py3_results
1426
1427 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1428 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001429 return self._MergePresubmitResults(py2_results, py3_results)
1430
1431 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1432 args = args[:]
1433 vpython = 'vpython3' if use_python3 else 'vpython'
1434
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])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001440 if self.GetUsePython3():
1441 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001442 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001443 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001444 if resultdb and realm:
1445 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001446
1447 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001448 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001449
Edward Lemur227d5102020-02-25 23:45:35 +00001450 metrics.collector.add_repeated('sub_commands', {
1451 'command': 'presubmit',
1452 'execution_time': time_time() - start,
1453 'exit_code': exit_code,
1454 })
1455
1456 if exit_code:
1457 sys.exit(exit_code)
1458
1459 json_results = gclient_utils.FileRead(json_output)
1460 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001461
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001462 def _MergePresubmitResults(self, py2_results, py3_results):
1463 return {
1464 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1465 py3_results.get('more_cc', []))),
1466 'errors': (
1467 py2_results.get('errors', []) + py3_results.get('errors', [])),
1468 'notifications': (
1469 py2_results.get('notifications', []) +
1470 py3_results.get('notifications', [])),
1471 'warnings': (
1472 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1473 }
1474
Brian Sheedy7326ca22022-11-02 18:36:17 +00001475 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001476 args = self._GetCommonPresubmitArgs(verbose, upstream)
1477 args.append('--post_upload')
1478
1479 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001480 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001481 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001482 if not py3_only:
1483 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001484 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1485 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001486 if not py3_only:
1487 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001488 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001489
Edward Lemur5a644f82020-03-18 16:44:57 +00001490 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001491 # type: (optparse.Values, Sequence[str], Sequence[str]
1492 # ) -> ChangeDescription
1493 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001494 if self.GetIssue():
1495 description = self.FetchDescription()
1496 elif options.message:
1497 description = options.message
1498 else:
1499 description = _create_description_from_log(git_diff_args)
1500 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001501 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001502
Edward Lemur5a644f82020-03-18 16:44:57 +00001503 bug = options.bug
1504 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001505 if not self.GetIssue():
1506 # Extract bug number from branch name, but only if issue is being created.
1507 # It must start with bug or fix, followed by _ or - and number.
1508 # Optionally, it may contain _ or - after number with arbitrary text.
1509 # Examples:
1510 # bug-123
1511 # bug_123
1512 # fix-123
1513 # fix-123-some-description
1514 match = re.match(
1515 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1516 self.GetBranch())
1517 if not bug and not fixed and match:
1518 if match.group('type') == 'bug':
1519 bug = match.group('bugnum')
1520 else:
1521 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001522
1523 change_description = ChangeDescription(description, bug, fixed)
1524
Joanna Wang39811b12023-01-20 23:09:48 +00001525 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001526 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001527 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001528 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001529 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001530 missing_files = [
1531 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001532 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001533 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001534 owners = self.owners_client.SuggestOwners(
1535 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001536 assert isinstance(options.reviewers, list), options.reviewers
1537 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001538
Edward Lemur5a644f82020-03-18 16:44:57 +00001539 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001540 if options.reviewers:
1541 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001542
1543 return change_description
1544
1545 def _GetTitleForUpload(self, options):
manukh566e9d02022-06-30 19:49:53 +00001546 # When not squashing or options.title is provided, just return
1547 # options.title.
1548 if not options.squash or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001549 return options.title
1550
1551 # On first upload, patchset title is always this string, while options.title
1552 # gets converted to first line of message.
1553 if not self.GetIssue():
1554 return 'Initial upload'
1555
1556 # When uploading subsequent patchsets, options.message is taken as the title
1557 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001558 if options.message:
1559 return options.message.strip()
1560
1561 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001562 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001563 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001564 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001565 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001566
1567 # Use the default title if the user confirms the default with a 'y'.
1568 if user_title.lower() == 'y':
1569 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001570 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001571
Joanna Wangb46232e2023-01-21 01:58:46 +00001572 def _PrepareChange(self, options, parent, end_commit):
1573 # type: (optparse.Values, str, str) ->
1574 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1575 """Prepares the change to be uploaded."""
1576 self.EnsureCanUploadPatchset(options.force)
1577
1578 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1579 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1580 files)
1581
1582 watchlist = watchlists.Watchlists(settings.GetRoot())
1583 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1584 if not options.bypass_hooks:
1585 hook_results = self.RunHook(committing=False,
1586 may_prompt=not options.force,
1587 verbose=options.verbose,
1588 parallel=options.parallel,
1589 upstream=parent,
1590 description=change_desc.description,
1591 all_files=False)
1592 self.ExtendCC(hook_results['more_cc'])
1593
1594 # Update the change description and ensure we have a Change Id.
1595 if self.GetIssue():
1596 if options.edit_description:
1597 change_desc.prompt()
1598 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1599 change_id = change_detail['change_id']
1600 change_desc.ensure_change_id(change_id)
1601
1602 # TODO(b/265929888): Pull in external changes for the current branch
1603 # only. No clear way to pull in external changes for upstream branches
1604 # yet. Potentially offer a separate command to pull in external changes.
1605 else: # No change issue. First time uploading
1606 if not options.force and not options.message_file:
1607 change_desc.prompt()
1608
1609 # Check if user added a change_id in the descripiton.
1610 change_ids = git_footers.get_footer_change_id(change_desc.description)
1611 if len(change_ids) == 1:
1612 change_id = change_ids[0]
1613 else:
1614 change_id = GenerateGerritChangeId(change_desc.description)
1615 change_desc.ensure_change_id(change_id)
1616
1617 if options.preserve_tryjobs:
1618 change_desc.set_preserve_tryjobs()
1619
1620 SaveDescriptionBackup(change_desc)
1621
1622 # Add ccs
1623 ccs = []
1624 # Add default, watchlist, presubmit ccs if this is an existing change
1625 # and CL is not private and auto-ccing has not been disabled.
1626 if self.GetIssue() and not (options.private and options.no_autocc):
1627 ccs = self.GetCCList().split(',')
1628 if len(ccs) > 100:
1629 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1630 'process/lsc/lsc_workflow.md')
1631 print('WARNING: This will auto-CC %s users.' % len(ccs))
1632 print('LSC may be more appropriate: %s' % lsc)
1633 print('You can also use the --no-autocc flag to disable auto-CC.')
1634 confirm_or_exit(action='continue')
1635
1636 # Add ccs from the --cc flag.
1637 if options.cc:
1638 ccs.extend(options.cc)
1639
1640 ccs = [email.strip() for email in ccs if email.strip()]
1641 if change_desc.get_cced():
1642 ccs.extend(change_desc.get_cced())
1643
1644 return change_desc.get_reviewers(), ccs, change_desc
1645
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001646 def CMDUpload(self, options, git_diff_args, orig_args):
1647 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001648 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001649 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001650 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001651 else:
1652 if self.GetBranch() is None:
1653 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1654
1655 # Default to diffing against common ancestor of upstream branch
1656 base_branch = self.GetCommonAncestorWithUpstream()
1657 git_diff_args = [base_branch, 'HEAD']
1658
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001659 # Fast best-effort checks to abort before running potentially expensive
1660 # hooks if uploading is likely to fail anyway. Passing these checks does
1661 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001662 self.EnsureAuthenticated(force=options.force)
1663 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001664
1665 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001666 watchlist = watchlists.Watchlists(settings.GetRoot())
1667 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001668 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001669 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001670
Edward Lemur5a644f82020-03-18 16:44:57 +00001671 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001672 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001673 hook_results = self.RunHook(
1674 committing=False,
1675 may_prompt=not options.force,
1676 verbose=options.verbose,
1677 parallel=options.parallel,
1678 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001679 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001680 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001681 resultdb=options.resultdb,
1682 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001683 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001684
Aaron Gable13101a62018-02-09 13:20:41 -08001685 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001686 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001687 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001688 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001689 self._GitSetBranchConfigValue(
Gavin Makbe2e9262022-11-08 23:41:55 +00001690 LAST_UPLOAD_HASH_CONFIG_KEY,
1691 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001692 # Run post upload hooks, if specified.
1693 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001694 self.RunPostUploadHook(options.verbose, base_branch,
1695 change_desc.description,
1696 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001697
1698 # Upload all dependencies if specified.
1699 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001700 print()
1701 print('--dependencies has been specified.')
1702 print('All dependent local branches will be re-uploaded.')
1703 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001704 # Remove the dependencies flag from args so that we do not end up in a
1705 # loop.
1706 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001707 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001708 return ret
1709
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001710 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001711 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001712
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001713 Issue must have been already uploaded and known. Optionally allows for
1714 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001715 """
1716 assert new_state in _CQState.ALL_STATES
1717 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001718 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001719 vote_map = {
1720 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001721 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001722 _CQState.DRY_RUN: 1,
1723 _CQState.COMMIT: 2,
1724 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001725 if new_state == _CQState.QUICK_RUN:
1726 labels = {
1727 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1728 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1729 }
1730 else:
1731 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001732 notify = False if new_state == _CQState.DRY_RUN else None
1733 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001734 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001735 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001736 return 0
1737 except KeyboardInterrupt:
1738 raise
1739 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001740 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001741 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001742 ' * Your project has no CQ,\n'
1743 ' * You don\'t have permission to change the CQ state,\n'
1744 ' * There\'s a bug in this code (see stack trace below).\n'
1745 'Consider specifying which bots to trigger manually or asking your '
1746 'project owners for permissions or contacting Chrome Infra at:\n'
1747 'https://www.chromium.org/infra\n\n' %
1748 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001749 # Still raise exception so that stack trace is printed.
1750 raise
1751
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001752 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001753 # Lazy load of configs.
1754 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001755 if self._gerrit_host and '.' not in self._gerrit_host:
1756 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1757 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001758 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001759 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001760 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001761 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001762 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1763 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764 return self._gerrit_host
1765
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001766 def _GetGitHost(self):
1767 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001768 remote_url = self.GetRemoteUrl()
1769 if not remote_url:
1770 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001771 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001772
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001773 def GetCodereviewServer(self):
1774 if not self._gerrit_server:
1775 # If we're on a branch then get the server potentially associated
1776 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001777 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001778 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001779 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001780 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001781 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001782 if not self._gerrit_server:
1783 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1784 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001785 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 parts[0] = parts[0] + '-review'
1787 self._gerrit_host = '.'.join(parts)
1788 self._gerrit_server = 'https://%s' % self._gerrit_host
1789 return self._gerrit_server
1790
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001791 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001792 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001793 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001794 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001795 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001796 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001797 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001798 if project.endswith('.git'):
1799 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001800 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1801 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1802 # gitiles/git-over-https protocol. E.g.,
1803 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1804 # as
1805 # https://chromium.googlesource.com/v8/v8
1806 if project.startswith('a/'):
1807 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001808 return project
1809
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001810 def _GerritChangeIdentifier(self):
1811 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1812
1813 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001814 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001815 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001816 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001817 if project:
1818 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1819 # Fall back on still unique, but less efficient change number.
1820 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001821
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001822 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001823 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001824 if settings.GetGerritSkipEnsureAuthenticated():
1825 # For projects with unusual authentication schemes.
1826 # See http://crbug.com/603378.
1827 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001828
1829 # Check presence of cookies only if using cookies-based auth method.
1830 cookie_auth = gerrit_util.Authenticator.get()
1831 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001832 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001833
Florian Mayerae510e82020-01-30 21:04:48 +00001834 remote_url = self.GetRemoteUrl()
1835 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001836 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001837 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001838 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1839 logging.warning(
1840 'Ignoring branch %(branch)s with non-https/sso remote '
1841 '%(remote)s', {
1842 'branch': self.branch,
1843 'remote': self.GetRemoteUrl()
1844 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001845 return
1846
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001847 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001848 self.GetCodereviewServer()
1849 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001850 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001851
1852 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1853 git_auth = cookie_auth.get_auth_header(git_host)
1854 if gerrit_auth and git_auth:
1855 if gerrit_auth == git_auth:
1856 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001857 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001858 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001859 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001860 ' %s\n'
1861 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001862 ' Consider running the following command:\n'
1863 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001864 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001865 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001866 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001867 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001868 cookie_auth.get_new_password_message(git_host)))
1869 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001870 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001871 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001872
1873 missing = (
1874 ([] if gerrit_auth else [self._gerrit_host]) +
1875 ([] if git_auth else [git_host]))
1876 DieWithError('Credentials for the following hosts are required:\n'
1877 ' %s\n'
1878 'These are read from %s (or legacy %s)\n'
1879 '%s' % (
1880 '\n '.join(missing),
1881 cookie_auth.get_gitcookies_path(),
1882 cookie_auth.get_netrc_path(),
1883 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001884
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001885 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001886 if not self.GetIssue():
1887 return
1888
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001889 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001890 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001891 DieWithError(
1892 'Change %s has been abandoned, new uploads are not allowed' %
1893 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001894 if status == 'MERGED':
1895 answer = gclient_utils.AskForData(
1896 'Change %s has been submitted, new uploads are not allowed. '
1897 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1898 ).lower()
1899 if answer not in ('y', ''):
1900 DieWithError('New uploads are not allowed.')
1901 self.SetIssue()
1902 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001903
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001904 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1905 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1906 # Apparently this check is not very important? Otherwise get_auth_email
1907 # could have been added to other implementations of Authenticator.
1908 cookies_auth = gerrit_util.Authenticator.get()
1909 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001910 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001911
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001912 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001913 if self.GetIssueOwner() == cookies_user:
1914 return
1915 logging.debug('change %s owner is %s, cookies user is %s',
1916 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001917 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001918 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001919 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001920 if details['email'] == self.GetIssueOwner():
1921 return
1922 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001923 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001924 'as %s.\n'
1925 'Uploading may fail due to lack of permissions.' %
1926 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1927 confirm_or_exit(action='upload')
1928
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001930 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001931 or CQ status, assuming adherence to a common workflow.
1932
1933 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001934 * 'error' - error from review tool (including deleted issues)
1935 * 'unsent' - no reviewers added
1936 * 'waiting' - waiting for review
1937 * 'reply' - waiting for uploader to reply to review
1938 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001939 * 'dry-run' - dry-running in the CQ
1940 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001941 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001942 """
1943 if not self.GetIssue():
1944 return None
1945
1946 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001947 data = self._GetChangeDetail([
1948 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001949 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001950 return 'error'
1951
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001952 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001953 return 'closed'
1954
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001955 cq_label = data['labels'].get('Commit-Queue', {})
1956 max_cq_vote = 0
1957 for vote in cq_label.get('all', []):
1958 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1959 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001960 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001961 if max_cq_vote == 1:
1962 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001963
Aaron Gable9ab38c62017-04-06 14:36:33 -07001964 if data['labels'].get('Code-Review', {}).get('approved'):
1965 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001966
1967 if not data.get('reviewers', {}).get('REVIEWER', []):
1968 return 'unsent'
1969
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001970 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001971 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001972 while messages:
1973 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001974 if (m.get('tag', '').startswith('autogenerated:cq') or
1975 m.get('tag', '').startswith('autogenerated:cv')):
1976 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001977 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001978 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001979 # Most recent message was by owner.
1980 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001981
1982 # Some reply from non-owner.
1983 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001984
1985 # Somehow there are no messages even though there are reviewers.
1986 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001987
Gavin Mak4e5e3992022-11-14 22:40:12 +00001988 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001989 if not self.GetIssue():
1990 return None
1991
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001992 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001993 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00001994 if update:
1995 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08001996 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001997
Gavin Makf35a9eb2022-11-17 18:34:36 +00001998 def _IsPatchsetRangeSignificant(self, lower, upper):
1999 """Returns True if the inclusive range of patchsets contains any reworks or
2000 rebases."""
2001 if not self.GetIssue():
2002 return False
2003
2004 data = self._GetChangeDetail(['ALL_REVISIONS'])
2005 ps_kind = {}
2006 for rev_info in data.get('revisions', {}).values():
2007 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2008
2009 for ps in range(lower, upper + 1):
2010 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2011 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2012 return True
2013 return False
2014
Gavin Make61ccc52020-11-13 00:12:57 +00002015 def GetMostRecentDryRunPatchset(self):
2016 """Get patchsets equivalent to the most recent patchset and return
2017 the patchset with the latest dry run. If none have been dry run, return
2018 the latest patchset."""
2019 if not self.GetIssue():
2020 return None
2021
2022 data = self._GetChangeDetail(['ALL_REVISIONS'])
2023 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002024 dry_run = {int(m['_revision_number'])
2025 for m in data.get('messages', [])
2026 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002027
2028 for revision_info in sorted(data.get('revisions', {}).values(),
2029 key=lambda c: c['_number'], reverse=True):
2030 if revision_info['_number'] in dry_run:
2031 patchset = revision_info['_number']
2032 break
2033 if revision_info.get('kind', '') not in \
2034 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2035 break
2036 self.SetPatchset(patchset)
2037 return patchset
2038
Aaron Gable636b13f2017-07-14 10:42:48 -07002039 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002040 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002041 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002042 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002043
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002044 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002045 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002046 # CURRENT_REVISION is included to get the latest patchset so that
2047 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002048 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002049 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2050 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002051 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002052 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002053 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002054 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002055
2056 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002057 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002058 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002059 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002060 line_comments = file_comments.setdefault(path, [])
2061 line_comments.extend(
2062 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002063
2064 # Build dictionary of file comments for easy access and sorting later.
2065 # {author+date: {path: {patchset: {line: url+message}}}}
2066 comments = collections.defaultdict(
2067 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002068
2069 server = self.GetCodereviewServer()
2070 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2071 # /c/ is automatically added by short URL server.
2072 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2073 self.GetIssue())
2074 else:
2075 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2076
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002077 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002078 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002079 tag = comment.get('tag', '')
2080 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002081 continue
2082 key = (comment['author']['email'], comment['updated'])
2083 if comment.get('side', 'REVISION') == 'PARENT':
2084 patchset = 'Base'
2085 else:
2086 patchset = 'PS%d' % comment['patch_set']
2087 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002088 url = ('%s/%s/%s#%s%s' %
2089 (url_prefix, comment['patch_set'], path,
2090 'b' if comment.get('side') == 'PARENT' else '',
2091 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002092 comments[key][path][patchset][line] = (url, comment['message'])
2093
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002094 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002095 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002096 summary = self._BuildCommentSummary(msg, comments, readable)
2097 if summary:
2098 summaries.append(summary)
2099 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002100
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002101 @staticmethod
2102 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002103 if 'email' not in msg['author']:
2104 # Some bot accounts may not have an email associated.
2105 return None
2106
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002107 key = (msg['author']['email'], msg['date'])
2108 # Don't bother showing autogenerated messages that don't have associated
2109 # file or line comments. this will filter out most autogenerated
2110 # messages, but will keep robot comments like those from Tricium.
2111 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2112 if is_autogenerated and not comments.get(key):
2113 return None
2114 message = msg['message']
2115 # Gerrit spits out nanoseconds.
2116 assert len(msg['date'].split('.')[-1]) == 9
2117 date = datetime.datetime.strptime(msg['date'][:-3],
2118 '%Y-%m-%d %H:%M:%S.%f')
2119 if key in comments:
2120 message += '\n'
2121 for path, patchsets in sorted(comments.get(key, {}).items()):
2122 if readable:
2123 message += '\n%s' % path
2124 for patchset, lines in sorted(patchsets.items()):
2125 for line, (url, content) in sorted(lines.items()):
2126 if line:
2127 line_str = 'Line %d' % line
2128 path_str = '%s:%d:' % (path, line)
2129 else:
2130 line_str = 'File comment'
2131 path_str = '%s:0:' % path
2132 if readable:
2133 message += '\n %s, %s: %s' % (patchset, line_str, url)
2134 message += '\n %s\n' % content
2135 else:
2136 message += '\n%s ' % path_str
2137 message += '\n%s\n' % content
2138
2139 return _CommentSummary(
2140 date=date,
2141 message=message,
2142 sender=msg['author']['email'],
2143 autogenerated=is_autogenerated,
2144 # These could be inferred from the text messages and correlated with
2145 # Code-Review label maximum, however this is not reliable.
2146 # Leaving as is until the need arises.
2147 approval=False,
2148 disapproval=False,
2149 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002150
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002151 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002152 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002153 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002154
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002155 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002156 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002157 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002158
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002159 def _GetChangeDetail(self, options=None):
2160 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002161 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002162 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002163
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002164 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002165 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002166 options.append('CURRENT_COMMIT')
2167
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002168 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002169 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002170 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002171
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002172 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2173 # Assumption: data fetched before with extra options is suitable
2174 # for return for a smaller set of options.
2175 # For example, if we cached data for
2176 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2177 # and request is for options=[CURRENT_REVISION],
2178 # THEN we can return prior cached data.
2179 if options_set.issubset(cached_options_set):
2180 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002181
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002182 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002183 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002184 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002185 except gerrit_util.GerritError as e:
2186 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002187 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002188 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002189
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002190 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002191 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002192
Gavin Mak4e5e3992022-11-14 22:40:12 +00002193 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002194 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002195 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002196 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2197 self._GerritChangeIdentifier(),
2198 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002199 except gerrit_util.GerritError as e:
2200 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002201 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002202 raise
agable32978d92016-11-01 12:55:02 -07002203 return data
2204
Karen Qian40c19422019-03-13 21:28:29 +00002205 def _IsCqConfigured(self):
2206 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002207 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002208
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002209 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002210 if git_common.is_dirty_git_tree('land'):
2211 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002212
tandriid60367b2016-06-22 05:25:12 -07002213 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002214 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002215 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002216 'which can test and land changes for you. '
2217 'Are you sure you wish to bypass it?\n',
2218 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002219 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002220 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002221 # Note: git diff outputs nothing if there is no diff.
2222 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002223 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002224 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002225 if detail['current_revision'] == last_upload:
2226 differs = False
2227 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002228 print('WARNING: Local branch contents differ from latest uploaded '
2229 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002230 if differs:
2231 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002232 confirm_or_exit(
2233 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2234 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002235 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002236 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002237 upstream = self.GetCommonAncestorWithUpstream()
2238 if self.GetIssue():
2239 description = self.FetchDescription()
2240 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002241 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002242 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002243 committing=True,
2244 may_prompt=not force,
2245 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002246 parallel=parallel,
2247 upstream=upstream,
2248 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002249 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002250 resultdb=resultdb,
2251 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002252
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002253 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002254 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002255 links = self._GetChangeCommit().get('web_links', [])
2256 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002257 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002258 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002259 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002260 return 0
2261
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002262 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2263 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002264 assert parsed_issue_arg.valid
2265
Edward Lemur125d60a2019-09-13 18:25:41 +00002266 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002267
2268 if parsed_issue_arg.hostname:
2269 self._gerrit_host = parsed_issue_arg.hostname
2270 self._gerrit_server = 'https://%s' % self._gerrit_host
2271
tandriic2405f52016-10-10 08:13:15 -07002272 try:
2273 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002274 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002275 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002276
2277 if not parsed_issue_arg.patchset:
2278 # Use current revision by default.
2279 revision_info = detail['revisions'][detail['current_revision']]
2280 patchset = int(revision_info['_number'])
2281 else:
2282 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002283 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002284 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2285 break
2286 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002287 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002288 (parsed_issue_arg.patchset, self.GetIssue()))
2289
Edward Lemur125d60a2019-09-13 18:25:41 +00002290 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002291 if remote_url.endswith('.git'):
2292 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002293 remote_url = remote_url.rstrip('/')
2294
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002295 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002296 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002297
2298 if remote_url != fetch_info['url']:
2299 DieWithError('Trying to patch a change from %s but this repo appears '
2300 'to be %s.' % (fetch_info['url'], remote_url))
2301
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002302 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002303
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002304 # If we have created a new branch then do the "set issue" immediately in
2305 # case the cherry-pick fails, which happens when resolving conflicts.
2306 if newbranch:
2307 self.SetIssue(parsed_issue_arg.issue)
2308
Aaron Gable62619a32017-06-16 08:22:09 -07002309 if force:
2310 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2311 print('Checked out commit for change %i patchset %i locally' %
2312 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002313 elif nocommit:
2314 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2315 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002316 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002317 RunGit(['cherry-pick', 'FETCH_HEAD'])
2318 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002319 (parsed_issue_arg.issue, patchset))
2320 print('Note: this created a local commit which does not have '
2321 'the same hash as the one uploaded for review. This will make '
2322 'uploading changes based on top of this branch difficult.\n'
2323 'If you want to do that, use "git cl patch --force" instead.')
2324
Stefan Zagerd08043c2017-10-12 12:07:02 -07002325 if self.GetBranch():
2326 self.SetIssue(parsed_issue_arg.issue)
2327 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002328 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002329 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2330 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002331 else:
2332 print('WARNING: You are in detached HEAD state.\n'
2333 'The patch has been applied to your checkout, but you will not be '
2334 'able to upload a new patch set to the gerrit issue.\n'
2335 'Try using the \'-b\' option if you would like to work on a '
2336 'branch and/or upload a new patch set.')
2337
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002338 return 0
2339
Joanna Wang18de1f62023-01-21 01:24:24 +00002340 @staticmethod
2341 def _GerritCommitMsgHookCheck(offer_removal):
2342 # type: (bool) -> None
2343 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002344 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2345 if not os.path.exists(hook):
2346 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002347 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2348 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002349 data = gclient_utils.FileRead(hook)
2350 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2351 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002352 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002353 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002354 'and may interfere with it in subtle ways.\n'
2355 'We recommend you remove the commit-msg hook.')
2356 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002357 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002358 gclient_utils.rm_file_or_tree(hook)
2359 print('Gerrit commit-msg hook removed.')
2360 else:
2361 print('OK, will keep Gerrit commit-msg hook in place.')
2362
Edward Lemur1b52d872019-05-09 21:12:12 +00002363 def _CleanUpOldTraces(self):
2364 """Keep only the last |MAX_TRACES| traces."""
2365 try:
2366 traces = sorted([
2367 os.path.join(TRACES_DIR, f)
2368 for f in os.listdir(TRACES_DIR)
2369 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2370 and not f.startswith('tmp'))
2371 ])
2372 traces_to_delete = traces[:-MAX_TRACES]
2373 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002374 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002375 except OSError:
2376 print('WARNING: Failed to remove old git traces from\n'
2377 ' %s'
2378 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002379
Edward Lemur5737f022019-05-17 01:24:00 +00002380 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002381 """Zip and write the git push traces stored in traces_dir."""
2382 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002383 traces_zip = trace_name + '-traces'
2384 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002385 # Create a temporary dir to store git config and gitcookies in. It will be
2386 # compressed and stored next to the traces.
2387 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002388 git_info_zip = trace_name + '-git-info'
2389
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002390 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002391
Edward Lemur1b52d872019-05-09 21:12:12 +00002392 git_push_metadata['trace_name'] = trace_name
2393 gclient_utils.FileWrite(
2394 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2395
2396 # Keep only the first 6 characters of the git hashes on the packet
2397 # trace. This greatly decreases size after compression.
2398 packet_traces = os.path.join(traces_dir, 'trace-packet')
2399 if os.path.isfile(packet_traces):
2400 contents = gclient_utils.FileRead(packet_traces)
2401 gclient_utils.FileWrite(
2402 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2403 shutil.make_archive(traces_zip, 'zip', traces_dir)
2404
2405 # Collect and compress the git config and gitcookies.
2406 git_config = RunGit(['config', '-l'])
2407 gclient_utils.FileWrite(
2408 os.path.join(git_info_dir, 'git-config'),
2409 git_config)
2410
2411 cookie_auth = gerrit_util.Authenticator.get()
2412 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2413 gitcookies_path = cookie_auth.get_gitcookies_path()
2414 if os.path.isfile(gitcookies_path):
2415 gitcookies = gclient_utils.FileRead(gitcookies_path)
2416 gclient_utils.FileWrite(
2417 os.path.join(git_info_dir, 'gitcookies'),
2418 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2419 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2420
Edward Lemur1b52d872019-05-09 21:12:12 +00002421 gclient_utils.rmtree(git_info_dir)
2422
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002423 def _RunGitPushWithTraces(self,
2424 refspec,
2425 refspec_opts,
2426 git_push_metadata,
2427 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002428 """Run git push and collect the traces resulting from the execution."""
2429 # Create a temporary directory to store traces in. Traces will be compressed
2430 # and stored in a 'traces' dir inside depot_tools.
2431 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002432 trace_name = os.path.join(
2433 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002434
2435 env = os.environ.copy()
2436 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2437 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002438 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002439 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2440 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2441 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2442
2443 try:
2444 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002445 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002446 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002447 push_cmd = ['git', 'push', remote_url, refspec]
2448 if git_push_options:
2449 for opt in git_push_options:
2450 push_cmd.extend(['-o', opt])
2451
Edward Lemur0f58ae42019-04-30 17:24:12 +00002452 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002453 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002454 env=env,
2455 print_stdout=True,
2456 # Flush after every line: useful for seeing progress when running as
2457 # recipe.
2458 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002459 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002460 except subprocess2.CalledProcessError as e:
2461 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002462 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002463 raise GitPushError(
2464 'Failed to create a change, very likely due to blocked keyword. '
2465 'Please examine output above for the reason of the failure.\n'
2466 'If this is a false positive, you can try to bypass blocked '
2467 'keyword by using push option '
2468 '-o uploadvalidator~skip, e.g.:\n'
2469 'git cl upload -o uploadvalidator~skip\n\n'
2470 'If git-cl is not working correctly, file a bug under the '
2471 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002472 if 'git push -o nokeycheck' in str(e.stdout):
2473 raise GitPushError(
2474 'Failed to create a change, very likely due to a private key being '
2475 'detected. Please examine output above for the reason of the '
2476 'failure.\n'
2477 'If this is a false positive, you can try to bypass private key '
2478 'detection by using push option '
2479 '-o nokeycheck, e.g.:\n'
2480 'git cl upload -o nokeycheck\n\n'
2481 'If git-cl is not working correctly, file a bug under the '
2482 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002483
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002484 raise GitPushError(
2485 'Failed to create a change. Please examine output above for the '
2486 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002487 'For emergencies, Googlers can escalate to '
2488 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002489 'Hint: run command below to diagnose common Git/Gerrit '
2490 'credential problems:\n'
2491 ' git cl creds-check\n'
2492 '\n'
2493 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2494 'component including the files below.\n'
2495 'Review the files before upload, since they might contain sensitive '
2496 'information.\n'
2497 'Set the Restrict-View-Google label so that they are not publicly '
2498 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002499 finally:
2500 execution_time = time_time() - before_push
2501 metrics.collector.add_repeated('sub_commands', {
2502 'command': 'git push',
2503 'execution_time': execution_time,
2504 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002505 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002506 })
2507
Edward Lemur1b52d872019-05-09 21:12:12 +00002508 git_push_metadata['execution_time'] = execution_time
2509 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002510 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002511
Edward Lemur1b52d872019-05-09 21:12:12 +00002512 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002513 gclient_utils.rmtree(traces_dir)
2514
2515 return push_stdout
2516
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002517 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2518 change_desc):
2519 """Upload the current branch to Gerrit, retry if new remote HEAD is
2520 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002521 remote, remote_branch = self.GetRemoteBranch()
2522 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2523
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002524 try:
2525 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002526 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002527 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002528 # Repository might be in the middle of transition to main branch as
2529 # default, and uploads to old default might be blocked.
2530 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002531 DieWithError(str(e), change_desc)
2532
Josip Sokcevicb631a882021-01-06 18:18:10 +00002533 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2534 self.GetGerritProject())
2535 if project_head == branch:
2536 DieWithError(str(e), change_desc)
2537 branch = project_head
2538
2539 print("WARNING: Fetching remote state and retrying upload to default "
2540 "branch...")
2541 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002542 options.edit_description = False
2543 options.force = True
2544 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002545 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2546 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002547 except GitPushError as e:
2548 DieWithError(str(e), change_desc)
2549
2550 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002551 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002552 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002553 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002554 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002555 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002556 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002557 # User requested to change description
2558 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002559 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002560 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2561 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002562 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002563
2564 # Check if changes outside of this workspace have been uploaded.
2565 current_rev = change_detail['current_revision']
2566 last_uploaded_rev = self._GitGetBranchConfigValue(
2567 GERRIT_SQUASH_HASH_CONFIG_KEY)
2568 if last_uploaded_rev and current_rev != last_uploaded_rev:
2569 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002570 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002571 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002572 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002573 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002574 if len(change_ids) == 1:
2575 change_id = change_ids[0]
2576 else:
2577 change_id = GenerateGerritChangeId(change_desc.description)
2578 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002579
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002580 if options.preserve_tryjobs:
2581 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002582
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002583 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002584 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002585 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002586 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002587 with gclient_utils.temporary_file() as desc_tempfile:
2588 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2589 ref_to_push = RunGit(
2590 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002591 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002592 if options.no_add_changeid:
2593 pass
2594 else: # adding Change-Ids is okay.
2595 if not git_footers.get_footer_change_id(change_desc.description):
2596 DownloadGerritHook(False)
2597 change_desc.set_description(
2598 self._AddChangeIdToCommitMessage(change_desc.description,
2599 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002600 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002601 # For no-squash mode, we assume the remote called "origin" is the one we
2602 # want. It is not worthwhile to support different workflows for
2603 # no-squash mode.
2604 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002605 # attempt to extract the changeid from the current description
2606 # fail informatively if not possible.
2607 change_id_candidates = git_footers.get_footer_change_id(
2608 change_desc.description)
2609 if not change_id_candidates:
2610 DieWithError("Unable to extract change-id from message.")
2611 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002612
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002613 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002614 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2615 ref_to_push)]).splitlines()
2616 if len(commits) > 1:
2617 print('WARNING: This will upload %d commits. Run the following command '
2618 'to see which commits will be uploaded: ' % len(commits))
2619 print('git log %s..%s' % (parent, ref_to_push))
2620 print('You can also use `git squash-branch` to squash these into a '
2621 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002622 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002623
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002624 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002625 cc = []
Joanna Wangc8f23e22023-01-19 21:18:10 +00002626 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002627 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2628 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002629 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002630 if len(cc) > 100:
2631 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2632 'process/lsc/lsc_workflow.md')
2633 print('WARNING: This will auto-CC %s users.' % len(cc))
2634 print('LSC may be more appropriate: %s' % lsc)
2635 print('You can also use the --no-autocc flag to disable auto-CC.')
2636 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002637 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002638 if options.cc:
2639 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002640 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002641 if change_desc.get_cced():
2642 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002643 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002644 valid_accounts = set(reviewers + cc)
2645 # TODO(crbug/877717): relax this for all hosts.
2646 else:
2647 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002648 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002649 logging.info('accounts %s are recognized, %s invalid',
2650 sorted(valid_accounts),
2651 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002652
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002653 # Extra options that can be specified at push time. Doc:
2654 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002655 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002656
Aaron Gable844cf292017-06-28 11:32:59 -07002657 # By default, new changes are started in WIP mode, and subsequent patchsets
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002658 # don't send email. At any time, passing --send-mail or --send-email will
2659 # mark the change ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002660 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002661 refspec_opts.append('ready')
2662 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002663 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002664 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002665 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002666 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002667
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002668 # TODO(tandrii): options.message should be posted as a comment if
2669 # --send-mail or --send-email is set on non-initial upload as Rietveld used
2670 # to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002671
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002672 # Set options.title in case user was prompted in _GetTitleForUpload and
2673 # _CMDUploadChange needs to be called again.
2674 options.title = self._GetTitleForUpload(options)
2675 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002676 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002677 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002678 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002679
agablec6787972016-09-09 16:13:34 -07002680 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002681 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002682
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002683 for r in sorted(reviewers):
2684 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002685 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002686 reviewers.remove(r)
2687 else:
2688 # TODO(tandrii): this should probably be a hard failure.
2689 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2690 % r)
2691 for c in sorted(cc):
2692 # refspec option will be rejected if cc doesn't correspond to an
2693 # account, even though REST call to add such arbitrary cc may succeed.
2694 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002695 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002696 cc.remove(c)
2697
rmistry9eadede2016-09-19 11:22:43 -07002698 if options.topic:
2699 # Documentation on Gerrit topics is here:
2700 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002701 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002702
Edward Lemur687ca902018-12-05 02:30:30 +00002703 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002704 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002705 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002706 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002707 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002708 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002709 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002710 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002711 elif options.cq_quick_run:
2712 refspec_opts.append('l=Commit-Queue+1')
2713 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002714
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002715 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002716 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002717 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002718 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002719 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2720
2721 refspec_suffix = ''
2722 if refspec_opts:
2723 refspec_suffix = '%' + ','.join(refspec_opts)
2724 assert ' ' not in refspec_suffix, (
2725 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2726 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002727
Edward Lemur1b52d872019-05-09 21:12:12 +00002728 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002729 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002730 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002731 'change_id': change_id,
2732 'description': change_desc.description,
2733 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002734
Gavin Mak4e5e3992022-11-14 22:40:12 +00002735 # Gerrit may or may not update fast enough to return the correct patchset
2736 # number after we push. Get the pre-upload patchset and increment later.
2737 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2738
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002739 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002740 git_push_metadata,
2741 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002742
2743 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002744 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002745 change_numbers = [m.group(1)
2746 for m in map(regex.match, push_stdout.splitlines())
2747 if m]
2748 if len(change_numbers) != 1:
2749 DieWithError(
2750 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002751 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002752 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002753 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002754 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002755
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002756 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002757 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002758 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002759 gerrit_util.AddReviewers(self.GetGerritHost(),
2760 self._GerritChangeIdentifier(),
2761 reviewers,
2762 cc,
2763 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002764
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002765 return 0
2766
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002767 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2768 change_desc):
2769 """Computes parent of the generated commit to be uploaded to Gerrit.
2770
2771 Returns revision or a ref name.
2772 """
2773 if custom_cl_base:
2774 # Try to avoid creating additional unintended CLs when uploading, unless
2775 # user wants to take this risk.
2776 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2777 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2778 local_ref_of_target_remote])
2779 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002780 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002781 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2782 'If you proceed with upload, more than 1 CL may be created by '
2783 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2784 'If you are certain that specified base `%s` has already been '
2785 'uploaded to Gerrit as another CL, you may proceed.\n' %
2786 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2787 if not force:
2788 confirm_or_exit(
2789 'Do you take responsibility for cleaning up potential mess '
2790 'resulting from proceeding with upload?',
2791 action='upload')
2792 return custom_cl_base
2793
Aaron Gablef97e33d2017-03-30 15:44:27 -07002794 if remote != '.':
2795 return self.GetCommonAncestorWithUpstream()
2796
2797 # If our upstream branch is local, we base our squashed commit on its
2798 # squashed version.
2799 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2800
Aaron Gablef97e33d2017-03-30 15:44:27 -07002801 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002802 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002803 if upstream_branch_name == 'main':
2804 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002805
2806 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002807 # TODO(tandrii): consider checking parent change in Gerrit and using its
2808 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2809 # the tree hash of the parent branch. The upside is less likely bogus
2810 # requests to reupload parent change just because it's uploadhash is
2811 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002812 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2813 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002814 # Verify that the upstream branch has been uploaded too, otherwise
2815 # Gerrit will create additional CLs when uploading.
2816 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2817 RunGitSilent(['rev-parse', parent + ':'])):
2818 DieWithError(
2819 '\nUpload upstream branch %s first.\n'
2820 'It is likely that this branch has been rebased since its last '
2821 'upload, so you just need to upload it again.\n'
2822 '(If you uploaded it with --no-squash, then branch dependencies '
2823 'are not supported, and you should reupload with --squash.)'
2824 % upstream_branch_name,
2825 change_desc)
2826 return parent
2827
Gavin Mak4e5e3992022-11-14 22:40:12 +00002828 def _UpdateWithExternalChanges(self):
2829 """Updates workspace with external changes.
2830
2831 Returns the commit hash that should be used as the merge base on upload.
2832 """
2833 local_ps = self.GetPatchset()
2834 if local_ps is None:
2835 return
2836
2837 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002838 if external_ps is None or local_ps == external_ps or \
2839 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002840 return
2841
2842 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002843 if num_changes > 1:
2844 change_words = 'changes were'
2845 else:
2846 change_words = 'change was'
2847 print('\n%d external %s published to %s:\n' %
2848 (num_changes, change_words, self.GetIssueURL(short=True)))
2849
2850 # Print an overview of external changes.
2851 ps_to_commit = {}
2852 ps_to_info = {}
2853 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2854 for commit_id, revision_info in revisions.get('revisions', {}).items():
2855 ps_num = revision_info['_number']
2856 ps_to_commit[ps_num] = commit_id
2857 ps_to_info[ps_num] = revision_info
2858
2859 for ps in range(external_ps, local_ps, -1):
2860 commit = ps_to_commit[ps][:8]
2861 desc = ps_to_info[ps].get('description', '')
2862 print('Patchset %d [%s] %s' % (ps, commit, desc))
2863
2864 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2865 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002866 return
2867
2868 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2869 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2870 external_base = external_parent['commit']
2871
2872 branch = git_common.current_branch()
2873 local_base = self.GetCommonAncestorWithUpstream()
2874 if local_base != external_base:
2875 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2876 (local_base, external_base))
2877 if git_common.upstream(branch):
2878 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2879 'to make these the same.')
2880 print('No upstream branch set. Consider setting it and using '
2881 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2882
2883 # Fetch Gerrit's CL base if it doesn't exist locally.
2884 remote, _ = self.GetRemoteBranch()
2885 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2886 RunGitSilent(['fetch', remote, external_base])
2887
2888 # Get the diff between local_ps and external_ps.
2889 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002890 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002891 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
2892 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2893 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
2894 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2895 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
2896
2897 # Diff can be empty in the case of trivial rebases.
2898 if not diff:
2899 return external_base
2900
2901 # Apply the diff.
2902 with gclient_utils.temporary_file() as diff_tempfile:
2903 gclient_utils.FileWrite(diff_tempfile, diff)
2904 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
2905 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
2906 if not clean_patch:
2907 # Normally patchset is set after upload. But because we exit, that never
2908 # happens. Updating here makes sure that subsequent uploads don't need
2909 # to fetch/apply the same diff again.
2910 self.SetPatchset(external_ps)
2911 DieWithError('\nPatch did not apply cleanly. Please resolve any '
2912 'conflicts and reupload.')
2913
2914 message = 'Incorporate external changes from '
2915 if num_changes == 1:
2916 message += 'patchset %d' % external_ps
2917 else:
2918 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
2919 RunGitSilent(['commit', '-am', message])
2920 # TODO(crbug.com/1382528): Use the previous commit's message as a default
2921 # patchset title instead of this 'Incorporate' message.
2922 return external_base
2923
Edward Lemura12175c2020-03-09 16:58:26 +00002924 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002925 """Re-commits using the current message, assumes the commit hook is in
2926 place.
2927 """
Edward Lemura12175c2020-03-09 16:58:26 +00002928 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002929 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002930 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002931 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002932 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002933
2934 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002935
tandriie113dfd2016-10-11 10:20:12 -07002936 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002937 try:
2938 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002939 except GerritChangeNotExists:
2940 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002941
2942 if data['status'] in ('ABANDONED', 'MERGED'):
2943 return 'CL %s is closed' % self.GetIssue()
2944
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002945 def GetGerritChange(self, patchset=None):
2946 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002947 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002948 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002949 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002950 data = self._GetChangeDetail(['ALL_REVISIONS'])
2951
2952 assert host and issue and patchset, 'CL must be uploaded first'
2953
2954 has_patchset = any(
2955 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002956 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002957 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002958 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002959 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002960
tandrii8c5a3532016-11-04 07:52:02 -07002961 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002962 'host': host,
2963 'change': issue,
2964 'project': data['project'],
2965 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002966 }
tandriie113dfd2016-10-11 10:20:12 -07002967
tandriide281ae2016-10-12 06:02:30 -07002968 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002969 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002970
Edward Lemur707d70b2018-02-07 00:50:14 +01002971 def GetReviewers(self):
2972 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002973 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002974
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002975
Lei Zhang8a0efc12020-08-05 19:58:45 +00002976def _get_bug_line_values(default_project_prefix, bugs):
2977 """Given default_project_prefix and comma separated list of bugs, yields bug
2978 line values.
tandriif9aefb72016-07-01 09:06:51 -07002979
2980 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002981 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002982 * string, which is left as is.
2983
2984 This function may produce more than one line, because bugdroid expects one
2985 project per line.
2986
Lei Zhang8a0efc12020-08-05 19:58:45 +00002987 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002988 ['v8:123', 'chromium:789']
2989 """
2990 default_bugs = []
2991 others = []
2992 for bug in bugs.split(','):
2993 bug = bug.strip()
2994 if bug:
2995 try:
2996 default_bugs.append(int(bug))
2997 except ValueError:
2998 others.append(bug)
2999
3000 if default_bugs:
3001 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003002 if default_project_prefix:
3003 if not default_project_prefix.endswith(':'):
3004 default_project_prefix += ':'
3005 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003006 else:
3007 yield default_bugs
3008 for other in sorted(others):
3009 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3010 yield other
3011
3012
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003013class ChangeDescription(object):
3014 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003015 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003016 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003017 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003018 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003019 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003020 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3021 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003022 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003023 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003024
Dan Beamd8b04ca2019-10-10 21:23:26 +00003025 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003026 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003027 if bug:
3028 regexp = re.compile(self.BUG_LINE)
3029 prefix = settings.GetBugPrefix()
3030 if not any((regexp.match(line) for line in self._description_lines)):
3031 values = list(_get_bug_line_values(prefix, bug))
3032 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003033 if fixed:
3034 regexp = re.compile(self.FIXED_LINE)
3035 prefix = settings.GetBugPrefix()
3036 if not any((regexp.match(line) for line in self._description_lines)):
3037 values = list(_get_bug_line_values(prefix, fixed))
3038 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003039
agable@chromium.org42c20792013-09-12 17:34:49 +00003040 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003041 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003042 return '\n'.join(self._description_lines)
3043
3044 def set_description(self, desc):
3045 if isinstance(desc, basestring):
3046 lines = desc.splitlines()
3047 else:
3048 lines = [line.rstrip() for line in desc]
3049 while lines and not lines[0]:
3050 lines.pop(0)
3051 while lines and not lines[-1]:
3052 lines.pop(-1)
3053 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003054
Edward Lemur5a644f82020-03-18 16:44:57 +00003055 def ensure_change_id(self, change_id):
3056 description = self.description
3057 footer_change_ids = git_footers.get_footer_change_id(description)
3058 # Make sure that the Change-Id in the description matches the given one.
3059 if footer_change_ids != [change_id]:
3060 if footer_change_ids:
3061 # Remove any existing Change-Id footers since they don't match the
3062 # expected change_id footer.
3063 description = git_footers.remove_footer(description, 'Change-Id')
3064 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3065 'if you want to set a new one.')
3066 # Add the expected Change-Id footer.
3067 description = git_footers.add_footer_change_id(description, change_id)
3068 self.set_description(description)
3069
Joanna Wang39811b12023-01-20 23:09:48 +00003070 def update_reviewers(self, reviewers):
3071 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003072
3073 Args:
3074 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003075 """
Joanna Wang39811b12023-01-20 23:09:48 +00003076 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003077 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003078
3079 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003080
Joanna Wang39811b12023-01-20 23:09:48 +00003081 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003082 regexp = re.compile(self.R_LINE)
3083 matches = [regexp.match(line) for line in self._description_lines]
3084 new_desc = [l for i, l in enumerate(self._description_lines)
3085 if not matches[i]]
3086 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003087
Joanna Wang39811b12023-01-20 23:09:48 +00003088 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003089
Joanna Wang39811b12023-01-20 23:09:48 +00003090 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003091 for match in matches:
3092 if not match:
3093 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003094 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003095
Joanna Wang39811b12023-01-20 23:09:48 +00003096 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003097
3098 # Put the new lines in the description where the old first R= line was.
3099 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3100 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003101 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003102 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003103 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003104
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003105 def set_preserve_tryjobs(self):
3106 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3107 footers = git_footers.parse_footers(self.description)
3108 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3109 if v.lower() == 'true':
3110 return
3111 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3112
Anthony Polito8b955342019-09-24 19:01:36 +00003113 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003114 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003115 self.set_description([
3116 '# Enter a description of the change.',
3117 '# This will be displayed on the codereview site.',
3118 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003119 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003120 '--------------------',
3121 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003122 bug_regexp = re.compile(self.BUG_LINE)
3123 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003124 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003125 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003126
Dan Beamd8b04ca2019-10-10 21:23:26 +00003127 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003128 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003129
Bruce Dawsonfc487042020-10-27 19:11:37 +00003130 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003131 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003132 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003133 if not content:
3134 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003135 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003136
Bruce Dawson2377b012018-01-11 16:46:49 -08003137 # Strip off comments and default inserted "Bug:" line.
3138 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003139 (line.startswith('#') or
3140 line.rstrip() == "Bug:" or
3141 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003142 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003143 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003144 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003145
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003146 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003147 """Adds a footer line to the description.
3148
3149 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3150 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3151 that Gerrit footers are always at the end.
3152 """
3153 parsed_footer_line = git_footers.parse_footer(line)
3154 if parsed_footer_line:
3155 # Line is a gerrit footer in the form: Footer-Key: any value.
3156 # Thus, must be appended observing Gerrit footer rules.
3157 self.set_description(
3158 git_footers.add_footer(self.description,
3159 key=parsed_footer_line[0],
3160 value=parsed_footer_line[1]))
3161 return
3162
3163 if not self._description_lines:
3164 self._description_lines.append(line)
3165 return
3166
3167 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3168 if gerrit_footers:
3169 # git_footers.split_footers ensures that there is an empty line before
3170 # actual (gerrit) footers, if any. We have to keep it that way.
3171 assert top_lines and top_lines[-1] == ''
3172 top_lines, separator = top_lines[:-1], top_lines[-1:]
3173 else:
3174 separator = [] # No need for separator if there are no gerrit_footers.
3175
3176 prev_line = top_lines[-1] if top_lines else ''
3177 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3178 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3179 top_lines.append('')
3180 top_lines.append(line)
3181 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003182
tandrii99a72f22016-08-17 14:33:24 -07003183 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003184 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003185 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003186 reviewers = [match.group(2).strip()
3187 for match in matches
3188 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003189 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003190
bradnelsond975b302016-10-23 12:20:23 -07003191 def get_cced(self):
3192 """Retrieves the list of reviewers."""
3193 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3194 cced = [match.group(2).strip() for match in matches if match]
3195 return cleanup_list(cced)
3196
Nodir Turakulov23b82142017-11-16 11:04:25 -08003197 def get_hash_tags(self):
3198 """Extracts and sanitizes a list of Gerrit hashtags."""
3199 subject = (self._description_lines or ('',))[0]
3200 subject = re.sub(
3201 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3202
3203 tags = []
3204 start = 0
3205 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3206 while True:
3207 m = bracket_exp.match(subject, start)
3208 if not m:
3209 break
3210 tags.append(self.sanitize_hash_tag(m.group(1)))
3211 start = m.end()
3212
3213 if not tags:
3214 # Try "Tag: " prefix.
3215 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3216 if m:
3217 tags.append(self.sanitize_hash_tag(m.group(1)))
3218 return tags
3219
3220 @classmethod
3221 def sanitize_hash_tag(cls, tag):
3222 """Returns a sanitized Gerrit hash tag.
3223
3224 A sanitized hashtag can be used as a git push refspec parameter value.
3225 """
3226 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3227
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003228
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003229def FindCodereviewSettingsFile(filename='codereview.settings'):
3230 """Finds the given file starting in the cwd and going up.
3231
3232 Only looks up to the top of the repository unless an
3233 'inherit-review-settings-ok' file exists in the root of the repository.
3234 """
3235 inherit_ok_file = 'inherit-review-settings-ok'
3236 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003237 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003238 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003239 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003240 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003241 if os.path.isfile(os.path.join(cwd, filename)):
3242 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003243 if cwd == root:
3244 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003245 parent_dir = os.path.dirname(cwd)
3246 if parent_dir == cwd:
3247 # We hit the system root directory.
3248 break
3249 cwd = parent_dir
3250 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003251
3252
3253def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003254 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003255 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003256
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003257 def SetProperty(name, setting, unset_error_ok=False):
3258 fullname = 'rietveld.' + name
3259 if setting in keyvals:
3260 RunGit(['config', fullname, keyvals[setting]])
3261 else:
3262 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3263
tandrii48df5812016-10-17 03:55:37 -07003264 if not keyvals.get('GERRIT_HOST', False):
3265 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003266 # Only server setting is required. Other settings can be absent.
3267 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003268 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003269 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3270 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003271 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003272 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3273 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003274 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3275 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003276 SetProperty(
3277 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003278 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003279
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003280 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003281 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003282
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003283 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003284 RunGit(['config', 'gerrit.squash-uploads',
3285 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003286
tandrii@chromium.org28253532016-04-14 13:46:56 +00003287 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003288 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003289 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3290
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003291 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003292 # should be of the form
3293 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3294 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003295 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3296 keyvals['ORIGIN_URL_CONFIG']])
3297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003298
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003299def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003300 """Downloads a network object to a local file, like urllib.urlretrieve.
3301
3302 This is necessary because urllib is broken for SSL connections via a proxy.
3303 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003304 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003305 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003306
3307
ukai@chromium.org712d6102013-11-27 00:52:58 +00003308def hasSheBang(fname):
3309 """Checks fname is a #! script."""
3310 with open(fname) as f:
3311 return f.read(2).startswith('#!')
3312
3313
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003314def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003315 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003316
3317 Args:
3318 force: True to update hooks. False to install hooks if not present.
3319 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003320 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003321 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3322 if not os.access(dst, os.X_OK):
3323 if os.path.exists(dst):
3324 if not force:
3325 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003326 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003327 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003328 if not hasSheBang(dst):
3329 DieWithError('Not a script: %s\n'
3330 'You need to download from\n%s\n'
3331 'into .git/hooks/commit-msg and '
3332 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003333 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3334 except Exception:
3335 if os.path.exists(dst):
3336 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003337 DieWithError('\nFailed to download hooks.\n'
3338 'You need to download from\n%s\n'
3339 'into .git/hooks/commit-msg and '
3340 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003341
3342
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003343class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003344 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003345
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003346 def __init__(self):
3347 # Cached list of [host, identity, source], where source is either
3348 # .gitcookies or .netrc.
3349 self._all_hosts = None
3350
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003351 def ensure_configured_gitcookies(self):
3352 """Runs checks and suggests fixes to make git use .gitcookies from default
3353 path."""
3354 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3355 configured_path = RunGitSilent(
3356 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003357 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003358 if configured_path:
3359 self._ensure_default_gitcookies_path(configured_path, default)
3360 else:
3361 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003362
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003363 @staticmethod
3364 def _ensure_default_gitcookies_path(configured_path, default_path):
3365 assert configured_path
3366 if configured_path == default_path:
3367 print('git is already configured to use your .gitcookies from %s' %
3368 configured_path)
3369 return
3370
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003371 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003372 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3373 (configured_path, default_path))
3374
3375 if not os.path.exists(configured_path):
3376 print('However, your configured .gitcookies file is missing.')
3377 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3378 action='reconfigure')
3379 RunGit(['config', '--global', 'http.cookiefile', default_path])
3380 return
3381
3382 if os.path.exists(default_path):
3383 print('WARNING: default .gitcookies file already exists %s' %
3384 default_path)
3385 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3386 default_path)
3387
3388 confirm_or_exit('Move existing .gitcookies to default location?',
3389 action='move')
3390 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003391 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003392 print('Moved and reconfigured git to use .gitcookies from %s' %
3393 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003394
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003395 @staticmethod
3396 def _configure_gitcookies_path(default_path):
3397 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3398 if os.path.exists(netrc_path):
3399 print('You seem to be using outdated .netrc for git credentials: %s' %
3400 netrc_path)
3401 print('This tool will guide you through setting up recommended '
3402 '.gitcookies store for git credentials.\n'
3403 '\n'
3404 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3405 ' git config --global --unset http.cookiefile\n'
3406 ' mv %s %s.backup\n\n' % (default_path, default_path))
3407 confirm_or_exit(action='setup .gitcookies')
3408 RunGit(['config', '--global', 'http.cookiefile', default_path])
3409 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003410
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003411 def get_hosts_with_creds(self, include_netrc=False):
3412 if self._all_hosts is None:
3413 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003414 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3415 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3416 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3417 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003418
3419 if include_netrc:
3420 return self._all_hosts
3421 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3422
3423 def print_current_creds(self, include_netrc=False):
3424 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3425 if not hosts:
3426 print('No Git/Gerrit credentials found')
3427 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003428 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003429 header = [('Host', 'User', 'Which file'),
3430 ['=' * l for l in lengths]]
3431 for row in (header + hosts):
3432 print('\t'.join((('%%+%ds' % l) % s)
3433 for l, s in zip(lengths, row)))
3434
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003435 @staticmethod
3436 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003437 """Parses identity "git-<username>.domain" into <username> and domain."""
3438 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003439 # distinguishable from sub-domains. But we do know typical domains:
3440 if identity.endswith('.chromium.org'):
3441 domain = 'chromium.org'
3442 username = identity[:-len('.chromium.org')]
3443 else:
3444 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003445 if username.startswith('git-'):
3446 username = username[len('git-'):]
3447 return username, domain
3448
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003449 def has_generic_host(self):
3450 """Returns whether generic .googlesource.com has been configured.
3451
3452 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3453 """
3454 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003455 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003456 return True
3457 return False
3458
3459 def _get_git_gerrit_identity_pairs(self):
3460 """Returns map from canonic host to pair of identities (Git, Gerrit).
3461
3462 One of identities might be None, meaning not configured.
3463 """
3464 host_to_identity_pairs = {}
3465 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003466 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003467 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3468 idx = 0 if canonical == host else 1
3469 pair[idx] = identity
3470 return host_to_identity_pairs
3471
3472 def get_partially_configured_hosts(self):
3473 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003474 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003475 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003476 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003477
3478 def get_conflicting_hosts(self):
3479 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003480 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003481 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003482 if None not in (i1, i2) and i1 != i2)
3483
3484 def get_duplicated_hosts(self):
3485 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003486 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003487
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003488
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003489 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003490 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003491 hosts = sorted(hosts)
3492 assert hosts
3493 if extra_column_func is None:
3494 extras = [''] * len(hosts)
3495 else:
3496 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003497 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3498 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003499 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003500 lines.append(tmpl % he)
3501 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003502
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003503 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003504 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003505 yield ('.googlesource.com wildcard record detected',
3506 ['Chrome Infrastructure team recommends to list full host names '
3507 'explicitly.'],
3508 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003509
3510 dups = self.get_duplicated_hosts()
3511 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003512 yield ('The following hosts were defined twice',
3513 self._format_hosts(dups),
3514 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003515
3516 partial = self.get_partially_configured_hosts()
3517 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003518 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3519 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003520 self._format_hosts(
3521 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3522 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003523
3524 conflicting = self.get_conflicting_hosts()
3525 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003526 yield ('The following Git hosts have differing credentials from their '
3527 'Gerrit counterparts',
3528 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3529 tuple(self._get_git_gerrit_identity_pairs()[host])),
3530 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003531
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003532 def find_and_report_problems(self):
3533 """Returns True if there was at least one problem, else False."""
3534 found = False
3535 bad_hosts = set()
3536 for title, sublines, hosts in self._find_problems():
3537 if not found:
3538 found = True
3539 print('\n\n.gitcookies problem report:\n')
3540 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003541 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003542 if sublines:
3543 print()
3544 print(' %s' % '\n '.join(sublines))
3545 print()
3546
3547 if bad_hosts:
3548 assert found
3549 print(' You can manually remove corresponding lines in your %s file and '
3550 'visit the following URLs with correct account to generate '
3551 'correct credential lines:\n' %
3552 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003553 print(' %s' % '\n '.join(
3554 sorted(
3555 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3556 _canonical_git_googlesource_host(host))
3557 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003558 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003559
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003560
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003561@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003562def CMDcreds_check(parser, args):
3563 """Checks credentials and suggests changes."""
3564 _, _ = parser.parse_args(args)
3565
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003566 # Code below checks .gitcookies. Abort if using something else.
3567 authn = gerrit_util.Authenticator.get()
3568 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003569 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003570 'This command is not designed for bot environment. It checks '
3571 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003572 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3573 if isinstance(authn, gerrit_util.GceAuthenticator):
3574 message += (
3575 '\n'
3576 'If you need to run this on GCE or a cloudtop instance, '
3577 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3578 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003579
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003580 checker = _GitCookiesChecker()
3581 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003582
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003583 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003584 checker.print_current_creds(include_netrc=True)
3585
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003586 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003587 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003588 return 0
3589 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003590
3591
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003592@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003593def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003594 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003595 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003596 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003597 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003598 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003599 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003600 return RunGit(['config', 'branch.%s.base-url' % branch],
3601 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003602
3603 print('Setting base-url to %s' % args[0])
3604 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3605 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003606
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003607
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003608def color_for_status(status):
3609 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003610 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003611 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003612 'unsent': BOLD + Fore.YELLOW,
3613 'waiting': BOLD + Fore.RED,
3614 'reply': BOLD + Fore.YELLOW,
3615 'not lgtm': BOLD + Fore.RED,
3616 'lgtm': BOLD + Fore.GREEN,
3617 'commit': BOLD + Fore.MAGENTA,
3618 'closed': BOLD + Fore.CYAN,
3619 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003620 }.get(status, Fore.WHITE)
3621
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003622
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003623def get_cl_statuses(changes, fine_grained, max_processes=None):
3624 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003625
3626 If fine_grained is true, this will fetch CL statuses from the server.
3627 Otherwise, simply indicate if there's a matching url for the given branches.
3628
3629 If max_processes is specified, it is used as the maximum number of processes
3630 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3631 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003632
3633 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003634 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003635 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003636 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003637
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003638 if not fine_grained:
3639 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003640 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003641 for cl in changes:
3642 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003643 return
3644
3645 # First, sort out authentication issues.
3646 logging.debug('ensuring credentials exist')
3647 for cl in changes:
3648 cl.EnsureAuthenticated(force=False, refresh=True)
3649
3650 def fetch(cl):
3651 try:
3652 return (cl, cl.GetStatus())
3653 except:
3654 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003655 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003656 raise
3657
3658 threads_count = len(changes)
3659 if max_processes:
3660 threads_count = max(1, min(threads_count, max_processes))
3661 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3662
Edward Lemur61bf4172020-02-24 23:22:37 +00003663 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003664 fetched_cls = set()
3665 try:
3666 it = pool.imap_unordered(fetch, changes).__iter__()
3667 while True:
3668 try:
3669 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003670 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003671 break
3672 fetched_cls.add(cl)
3673 yield cl, status
3674 finally:
3675 pool.close()
3676
3677 # Add any branches that failed to fetch.
3678 for cl in set(changes) - fetched_cls:
3679 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003680
rmistry@google.com2dd99862015-06-22 12:22:18 +00003681
Jose Lopes3863fc52020-04-07 17:00:25 +00003682def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003683 """Uploads CLs of local branches that are dependents of the current branch.
3684
3685 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003686
3687 test1 -> test2.1 -> test3.1
3688 -> test3.2
3689 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003690
3691 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3692 run on the dependent branches in this order:
3693 test2.1, test3.1, test3.2, test2.2, test3.3
3694
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003695 Note: This function does not rebase your local dependent branches. Use it
3696 when you make a change to the parent branch that will not conflict
3697 with its dependent branches, and you would like their dependencies
3698 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003699 """
3700 if git_common.is_dirty_git_tree('upload-branch-deps'):
3701 return 1
3702
3703 root_branch = cl.GetBranch()
3704 if root_branch is None:
3705 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3706 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003707 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003708 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3709 'patchset dependencies without an uploaded CL.')
3710
3711 branches = RunGit(['for-each-ref',
3712 '--format=%(refname:short) %(upstream:short)',
3713 'refs/heads'])
3714 if not branches:
3715 print('No local branches found.')
3716 return 0
3717
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003718 # Create a dictionary of all local branches to the branches that are
3719 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003720 tracked_to_dependents = collections.defaultdict(list)
3721 for b in branches.splitlines():
3722 tokens = b.split()
3723 if len(tokens) == 2:
3724 branch_name, tracked = tokens
3725 tracked_to_dependents[tracked].append(branch_name)
3726
vapiera7fbd5a2016-06-16 09:17:49 -07003727 print()
3728 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003729 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003730
rmistry@google.com2dd99862015-06-22 12:22:18 +00003731 def traverse_dependents_preorder(branch, padding=''):
3732 dependents_to_process = tracked_to_dependents.get(branch, [])
3733 padding += ' '
3734 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003736 dependents.append(dependent)
3737 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003738
rmistry@google.com2dd99862015-06-22 12:22:18 +00003739 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003740 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003741
3742 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003744 return 0
3745
Jose Lopes3863fc52020-04-07 17:00:25 +00003746 if not force:
3747 confirm_or_exit('This command will checkout all dependent branches and run '
3748 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003749
rmistry@google.com2dd99862015-06-22 12:22:18 +00003750 # Record all dependents that failed to upload.
3751 failures = {}
3752 # Go through all dependents, checkout the branch and upload.
3753 try:
3754 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003755 print()
3756 print('--------------------------------------')
3757 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003758 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003759 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003760 try:
3761 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003762 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003763 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003764 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003765 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003767 finally:
3768 # Swap back to the original root branch.
3769 RunGit(['checkout', '-q', root_branch])
3770
vapiera7fbd5a2016-06-16 09:17:49 -07003771 print()
3772 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003773 for dependent_branch in dependents:
3774 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003775 print(' %s : %s' % (dependent_branch, upload_status))
3776 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003777
3778 return 0
3779
3780
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003781def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003782 """Given a proposed tag name, returns a tag name that is guaranteed to be
3783 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3784 or 'foo-3', and so on."""
3785
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003786 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003787 for suffix_num in itertools.count(1):
3788 if suffix_num == 1:
3789 to_check = proposed_tag
3790 else:
3791 to_check = '%s-%d' % (proposed_tag, suffix_num)
3792
3793 if to_check not in existing_tags:
3794 return to_check
3795
3796
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003797@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003798def CMDarchive(parser, args):
3799 """Archives and deletes branches associated with closed changelists."""
3800 parser.add_option(
3801 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003802 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003803 parser.add_option(
3804 '-f', '--force', action='store_true',
3805 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003806 parser.add_option(
3807 '-d', '--dry-run', action='store_true',
3808 help='Skip the branch tagging and removal steps.')
3809 parser.add_option(
3810 '-t', '--notags', action='store_true',
3811 help='Do not tag archived branches. '
3812 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003813 parser.add_option(
3814 '-p',
3815 '--pattern',
3816 default='git-cl-archived-{issue}-{branch}',
3817 help='Format string for archive tags. '
3818 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003819
kmarshall3bff56b2016-06-06 18:31:47 -07003820 options, args = parser.parse_args(args)
3821 if args:
3822 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003823
3824 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3825 if not branches:
3826 return 0
3827
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003828 tags = RunGit(['for-each-ref', '--format=%(refname)',
3829 'refs/tags']).splitlines() or []
3830 tags = [t.split('/')[-1] for t in tags]
3831
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003833 changes = [Changelist(branchref=b)
3834 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003835 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3836 statuses = get_cl_statuses(changes,
3837 fine_grained=True,
3838 max_processes=options.maxjobs)
3839 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003840 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3841 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003842 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003843 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003844 proposal.sort()
3845
3846 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003848 return 0
3849
Edward Lemur85153282020-02-14 22:06:29 +00003850 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003851
vapiera7fbd5a2016-06-16 09:17:49 -07003852 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003853 if options.notags:
3854 for next_item in proposal:
3855 print(' ' + next_item[0])
3856 else:
3857 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3858 for next_item in proposal:
3859 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003860
kmarshall9249e012016-08-23 12:02:16 -07003861 # Quit now on precondition failure or if instructed by the user, either
3862 # via an interactive prompt or by command line flags.
3863 if options.dry_run:
3864 print('\nNo changes were made (dry run).\n')
3865 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003866
3867 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003868 print('You are currently on a branch \'%s\' which is associated with a '
3869 'closed codereview issue, so archive cannot proceed. Please '
3870 'checkout another branch and run this command again.' %
3871 current_branch)
3872 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003873
3874 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003875 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003876 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003878 return 1
3879
3880 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003881 if not options.notags:
3882 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003883
3884 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3885 # Clean up the tag if we failed to delete the branch.
3886 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003887
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003889
3890 return 0
3891
3892
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003893@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003894def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003895 """Show status of changelists.
3896
3897 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003898 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003899 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003900 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003901 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003902 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003903 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003904 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003905
3906 Also see 'git cl comments'.
3907 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003908 parser.add_option(
3909 '--no-branch-color',
3910 action='store_true',
3911 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003912 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003913 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003914 parser.add_option('-f', '--fast', action='store_true',
3915 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003916 parser.add_option(
3917 '-j', '--maxjobs', action='store', type=int,
3918 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003919 parser.add_option(
3920 '-i', '--issue', type=int,
3921 help='Operate on this issue instead of the current branch\'s implicit '
3922 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003923 parser.add_option('-d',
3924 '--date-order',
3925 action='store_true',
3926 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003927 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003928 if args:
3929 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930
iannuccie53c9352016-08-17 14:40:40 -07003931 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003932 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003933
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003934 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003935 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003936 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003937 if cl.GetIssue():
3938 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003939 elif options.field == 'id':
3940 issueid = cl.GetIssue()
3941 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003942 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003943 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003944 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003945 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003946 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003947 elif options.field == 'status':
3948 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003949 elif options.field == 'url':
3950 url = cl.GetIssueURL()
3951 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003952 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003953 return 0
3954
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003955 branches = RunGit([
3956 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3957 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003958 if not branches:
3959 print('No local branch found.')
3960 return 0
3961
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003962 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003963 Changelist(branchref=b, commit_date=ct)
3964 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3965 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003966 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003967 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003968 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003969 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003970
Edward Lemur85153282020-02-14 22:06:29 +00003971 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003972
3973 def FormatBranchName(branch, colorize=False):
3974 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3975 an asterisk when it is the current branch."""
3976
3977 asterisk = ""
3978 color = Fore.RESET
3979 if branch == current_branch:
3980 asterisk = "* "
3981 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003982 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003983
3984 if colorize:
3985 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003986 return asterisk + branch_name
3987
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003988 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003989
3990 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003991
3992 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003993 sorted_changes = sorted(changes,
3994 key=lambda c: c.GetCommitDate(),
3995 reverse=True)
3996 else:
3997 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3998 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003999 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004000 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004001 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004002 branch_statuses[c.GetBranch()] = status
4003 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004004 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004005 if url and (not status or status == 'error'):
4006 # The issue probably doesn't exist anymore.
4007 url += ' (broken)'
4008
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004009 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004010 # Turn off bold as well as colors.
4011 END = '\033[0m'
4012 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004013 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004014 color = ''
4015 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004016 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004017
Alan Cuttera3be9a52019-03-04 18:50:33 +00004018 branch_display = FormatBranchName(branch)
4019 padding = ' ' * (alignment - len(branch_display))
4020 if not options.no_branch_color:
4021 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004022
Alan Cuttera3be9a52019-03-04 18:50:33 +00004023 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4024 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004025
vapiera7fbd5a2016-06-16 09:17:49 -07004026 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004027 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004028 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004029 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004030 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004031 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004032 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004033 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004034 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004035 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004036 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004037 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004038 return 0
4039
4040
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004041def colorize_CMDstatus_doc():
4042 """To be called once in main() to add colors to git cl status help."""
4043 colors = [i for i in dir(Fore) if i[0].isupper()]
4044
4045 def colorize_line(line):
4046 for color in colors:
4047 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004048 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004049 indent = len(line) - len(line.lstrip(' ')) + 1
4050 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4051 return line
4052
4053 lines = CMDstatus.__doc__.splitlines()
4054 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4055
4056
phajdan.jre328cf92016-08-22 04:12:17 -07004057def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004058 if path == '-':
4059 json.dump(contents, sys.stdout)
4060 else:
4061 with open(path, 'w') as f:
4062 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004063
4064
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004065@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004066@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004067def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004068 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004069
4070 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004071 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004072 parser.add_option('-r', '--reverse', action='store_true',
4073 help='Lookup the branch(es) for the specified issues. If '
4074 'no issues are specified, all branches with mapped '
4075 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004076 parser.add_option('--json',
4077 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004078 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079
dnj@chromium.org406c4402015-03-03 17:22:28 +00004080 if options.reverse:
4081 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004082 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004083 # Reverse issue lookup.
4084 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004085
4086 git_config = {}
4087 for config in RunGit(['config', '--get-regexp',
4088 r'branch\..*issue']).splitlines():
4089 name, _space, val = config.partition(' ')
4090 git_config[name] = val
4091
dnj@chromium.org406c4402015-03-03 17:22:28 +00004092 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004093 issue = git_config.get(
4094 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004095 if issue:
4096 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004097 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004098 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004099 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004100 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004101 try:
4102 issue_num = int(issue)
4103 except ValueError:
4104 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004105 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004106 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004107 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004108 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004109 if options.json:
4110 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004111 return 0
4112
4113 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004114 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004115 if not issue.valid:
4116 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4117 'or no argument to list it.\n'
4118 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004119 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004120 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004121 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004122 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004123 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4124 if options.json:
4125 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004126 'gerrit_host': cl.GetGerritHost(),
4127 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004128 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004129 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004130 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004131 return 0
4132
4133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004134@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004135def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004136 """Shows or posts review comments for any changelist."""
4137 parser.add_option('-a', '--add-comment', dest='comment',
4138 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004139 parser.add_option('-p', '--publish', action='store_true',
4140 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004141 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004142 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004143 parser.add_option('-m', '--machine-readable', dest='readable',
4144 action='store_false', default=True,
4145 help='output comments in a format compatible with '
4146 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004147 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004148 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004149 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004150
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004151 issue = None
4152 if options.issue:
4153 try:
4154 issue = int(options.issue)
4155 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004156 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004157
Edward Lemur934836a2019-09-09 20:16:54 +00004158 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004159
4160 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004161 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004162 return 0
4163
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004164 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4165 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004166 for comment in summary:
4167 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004168 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004169 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004170 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004171 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004172 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004173 elif comment.autogenerated:
4174 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004175 else:
4176 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004177 print('\n%s%s %s%s\n%s' % (
4178 color,
4179 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4180 comment.sender,
4181 Fore.RESET,
4182 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4183
smut@google.comc85ac942015-09-15 16:34:43 +00004184 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004185 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004186 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004187 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4188 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004189 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004190 return 0
4191
4192
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004193@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004194@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004195def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004196 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004197 parser.add_option('-d', '--display', action='store_true',
4198 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004199 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004200 help='New description to set for this issue (- for stdin, '
4201 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004202 parser.add_option('-f', '--force', action='store_true',
4203 help='Delete any unpublished Gerrit edits for this issue '
4204 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004205
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004206 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004207
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004208 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004209 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004210 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004211 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004212 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004213
Edward Lemur934836a2019-09-09 20:16:54 +00004214 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004215 if target_issue_arg:
4216 kwargs['issue'] = target_issue_arg.issue
4217 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004218
4219 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004220 if not cl.GetIssue():
4221 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004222
Edward Lemur678a6842019-10-03 22:25:05 +00004223 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004224 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004225
Edward Lemur6c6827c2020-02-06 21:15:18 +00004226 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004227
smut@google.com34fb6b12015-07-13 20:03:26 +00004228 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004230 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004231
4232 if options.new_description:
4233 text = options.new_description
4234 if text == '-':
4235 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004236 elif text == '+':
4237 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004238 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004239
4240 description.set_description(text)
4241 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004242 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004243 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004244 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004245 return 0
4246
4247
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004248@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004249def CMDlint(parser, args):
4250 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004251 parser.add_option('--filter', action='append', metavar='-x,+y',
4252 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004253 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004254
4255 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004256 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004257 try:
4258 import cpplint
4259 import cpplint_chromium
4260 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004261 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004262 return 1
4263
4264 # Change the current working directory before calling lint so that it
4265 # shows the correct base.
4266 previous_cwd = os.getcwd()
4267 os.chdir(settings.GetRoot())
4268 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004269 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004270 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004271 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004272 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004273 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004274
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004275 # Process cpplint arguments, if any.
4276 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4277 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004278 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004279
Lei Zhang379d1ad2020-07-15 19:40:06 +00004280 include_regex = re.compile(settings.GetLintRegex())
4281 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004282 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4283 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004284 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004285 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004286 continue
4287
4288 if ignore_regex.match(filename):
4289 print('Ignoring file %s' % filename)
4290 continue
4291
4292 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4293 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004294 finally:
4295 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004296 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004297 if cpplint._cpplint_state.error_count != 0:
4298 return 1
4299 return 0
4300
4301
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004302@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004303def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004304 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004305 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004306 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004307 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004308 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004309 parser.add_option('--all', action='store_true',
4310 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004311 parser.add_option('--files',
4312 nargs=1,
4313 help='Semicolon-separated list of files to be marked as '
4314 'modified when executing presubmit or post-upload hooks. '
4315 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004316 parser.add_option('--parallel', action='store_true',
4317 help='Run all tests specified by input_api.RunTests in all '
4318 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004319 parser.add_option('--resultdb', action='store_true',
4320 help='Run presubmit checks in the ResultSink environment '
4321 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004322 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004323 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004324
sbc@chromium.org71437c02015-04-09 19:29:40 +00004325 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004326 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004327 return 1
4328
Edward Lemur934836a2019-09-09 20:16:54 +00004329 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004330 if args:
4331 base_branch = args[0]
4332 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004333 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004334 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004335
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004336 start = time.time()
4337 try:
4338 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4339 description = cl.FetchDescription()
4340 else:
4341 description = _create_description_from_log([base_branch])
4342 except Exception as e:
4343 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004344 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004345 elapsed = time.time() - start
4346 if elapsed > 5:
4347 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004348
Bruce Dawson13acea32022-05-03 22:13:08 +00004349 if not base_branch:
4350 if not options.force:
4351 print('use --force to check even when not on a branch.')
4352 return 1
4353 base_branch = 'HEAD'
4354
Josip Sokcevic017544d2022-03-31 23:47:53 +00004355 cl.RunHook(committing=not options.upload,
4356 may_prompt=False,
4357 verbose=options.verbose,
4358 parallel=options.parallel,
4359 upstream=base_branch,
4360 description=description,
4361 all_files=options.all,
4362 files=options.files,
4363 resultdb=options.resultdb,
4364 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004365 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004366
4367
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004368def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004369 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004370
4371 Works the same way as
4372 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4373 but can be called on demand on all platforms.
4374
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004375 The basic idea is to generate git hash of a state of the tree, original
4376 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004377 """
4378 lines = []
4379 tree_hash = RunGitSilent(['write-tree'])
4380 lines.append('tree %s' % tree_hash.strip())
4381 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4382 if code == 0:
4383 lines.append('parent %s' % parent.strip())
4384 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4385 lines.append('author %s' % author.strip())
4386 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4387 lines.append('committer %s' % committer.strip())
4388 lines.append('')
4389 # Note: Gerrit's commit-hook actually cleans message of some lines and
4390 # whitespace. This code is not doing this, but it clearly won't decrease
4391 # entropy.
4392 lines.append(message)
4393 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004394 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004395 return 'I%s' % change_hash.strip()
4396
4397
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004398def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004399 """Computes the remote branch ref to use for the CL.
4400
4401 Args:
4402 remote (str): The git remote for the CL.
4403 remote_branch (str): The git remote branch for the CL.
4404 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004405 """
4406 if not (remote and remote_branch):
4407 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004408
wittman@chromium.org455dc922015-01-26 20:15:50 +00004409 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004410 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004411 # refs, which are then translated into the remote full symbolic refs
4412 # below.
4413 if '/' not in target_branch:
4414 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4415 else:
4416 prefix_replacements = (
4417 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4418 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4419 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4420 )
4421 match = None
4422 for regex, replacement in prefix_replacements:
4423 match = re.search(regex, target_branch)
4424 if match:
4425 remote_branch = target_branch.replace(match.group(0), replacement)
4426 break
4427 if not match:
4428 # This is a branch path but not one we recognize; use as-is.
4429 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004430 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004431 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004432 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004433 # Handle the refs that need to land in different refs.
4434 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004435
wittman@chromium.org455dc922015-01-26 20:15:50 +00004436 # Create the true path to the remote branch.
4437 # Does the following translation:
4438 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004439 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004440 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4441 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4442 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4443 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4444 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4445 'refs/heads/')
4446 elif remote_branch.startswith('refs/remotes/branch-heads'):
4447 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004448
wittman@chromium.org455dc922015-01-26 20:15:50 +00004449 return remote_branch
4450
4451
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004452def cleanup_list(l):
4453 """Fixes a list so that comma separated items are put as individual items.
4454
4455 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4456 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4457 """
4458 items = sum((i.split(',') for i in l), [])
4459 stripped_items = (i.strip() for i in items)
4460 return sorted(filter(None, stripped_items))
4461
4462
Aaron Gable4db38df2017-11-03 14:59:07 -07004463@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004464@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004465def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004466 """Uploads the current changelist to codereview.
4467
4468 Can skip dependency patchset uploads for a branch by running:
4469 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004470 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004471 git config --unset branch.branch_name.skip-deps-uploads
4472 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004473
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004474 If the name of the checked out branch starts with "bug-" or "fix-" followed
4475 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004476 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004477
4478 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004479 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004480 [git-cl] add support for hashtags
4481 Foo bar: implement foo
4482 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004483 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004484 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4485 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004486 parser.add_option('--bypass-watchlists', action='store_true',
4487 dest='bypass_watchlists',
4488 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004489 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004490 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004491 parser.add_option('--message', '-m', dest='message',
4492 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004493 parser.add_option('-b', '--bug',
4494 help='pre-populate the bug number(s) for this issue. '
4495 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004496 parser.add_option('--message-file', dest='message_file',
4497 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004498 parser.add_option('--title', '-t', dest='title',
4499 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004500 parser.add_option('-T', '--skip-title', action='store_true',
4501 dest='skip_title',
4502 help='Use the most recent commit message as the title of '
4503 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004504 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004505 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004506 help='reviewer email addresses')
4507 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004508 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004509 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004510 parser.add_option('--hashtag', dest='hashtags',
4511 action='append', default=[],
4512 help=('Gerrit hashtag for new CL; '
4513 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004514 parser.add_option('-s',
4515 '--send-mail',
4516 '--send-email',
4517 dest='send_mail',
4518 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004519 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004520 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004521 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004522 metavar='TARGET',
4523 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004524 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004525 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004526 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004527 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004528 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004529 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004530 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004531 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4532 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004533 parser.add_option('-c',
4534 '--use-commit-queue',
4535 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004536 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004537 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004538 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004539 parser.add_option('-d', '--cq-dry-run',
4540 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004541 help='Send the patchset to do a CQ dry run right after '
4542 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004543 parser.add_option(
4544 '-q',
4545 '--cq-quick-run',
4546 action='store_true',
4547 default=False,
4548 help='Send the patchset to do a CQ quick run right after '
4549 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4550 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004551 parser.add_option('--set-bot-commit', action='store_true',
4552 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004553 parser.add_option('--preserve-tryjobs', action='store_true',
4554 help='instruct the CQ to let tryjobs running even after '
4555 'new patchsets are uploaded instead of canceling '
4556 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004557 parser.add_option('--dependencies', action='store_true',
4558 help='Uploads CLs of all the local branches that depend on '
4559 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004560 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4561 help='Sends your change to the CQ after an approval. Only '
4562 'works on repos that have the Auto-Submit label '
4563 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004564 parser.add_option('--parallel', action='store_true',
4565 help='Run all tests specified by input_api.RunTests in all '
4566 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004567 parser.add_option('--no-autocc', action='store_true',
4568 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004569 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004570 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004571 parser.add_option('-R', '--retry-failed', action='store_true',
4572 help='Retry failed tryjobs from old patchset immediately '
4573 'after uploading new patchset. Cannot be used with '
4574 '--use-commit-queue or --cq-dry-run.')
4575 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4576 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004577 parser.add_option('--fixed', '-x',
4578 help='List of bugs that will be commented on and marked '
4579 'fixed (pre-populates "Fixed:" tag). Same format as '
4580 '-b option / "Bug:" tag. If fixing several issues, '
4581 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004582 parser.add_option('--edit-description', action='store_true', default=False,
4583 help='Modify description before upload. Cannot be used '
4584 'with --force. It is a noop when --no-squash is set '
4585 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004586 parser.add_option('--git-completion-helper', action="store_true",
4587 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004588 parser.add_option('--resultdb', action='store_true',
4589 help='Run presubmit checks in the ResultSink environment '
4590 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004591 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004592 parser.add_option('-o',
4593 '--push-options',
4594 action='append',
4595 default=[],
4596 help='Transmit the given string to the server when '
4597 'performing git push (pass-through). See git-push '
4598 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004599 parser.add_option('--no-add-changeid',
4600 action='store_true',
4601 dest='no_add_changeid',
4602 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004603 parser.add_option('--no-python2-post-upload-hooks',
4604 action='store_true',
4605 help='Only run post-upload hooks in Python 3.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004606 parser.add_option('--stacked-exp',
4607 action='store_true',
4608 help=optparse.SUPPRESS_HELP)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004609
rmistry@google.com2dd99862015-06-22 12:22:18 +00004610 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004611 (options, args) = parser.parse_args(args)
4612
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004613 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004614 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4615 if opt.help != optparse.SUPPRESS_HELP))
4616 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004617
sbc@chromium.org71437c02015-04-09 19:29:40 +00004618 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004619 return 1
4620
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004621 options.reviewers = cleanup_list(options.reviewers)
4622 options.cc = cleanup_list(options.cc)
4623
Josipe827b0f2020-01-30 00:07:20 +00004624 if options.edit_description and options.force:
4625 parser.error('Only one of --force and --edit-description allowed')
4626
tandriib80458a2016-06-23 12:20:07 -07004627 if options.message_file:
4628 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004629 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004630 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004631
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004632 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004633 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004634 options.use_commit_queue,
4635 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004636 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4637 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004638
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004639 if options.skip_title and options.title:
4640 parser.error('Only one of --title and --skip-title allowed.')
4641
Aaron Gableedbc4132017-09-11 13:22:28 -07004642 if options.use_commit_queue:
4643 options.send_mail = True
4644
Edward Lesmes0dd54822020-03-26 18:24:25 +00004645 if options.squash is None:
4646 # Load default for user, repo, squash=true, in this order.
4647 options.squash = settings.GetSquashGerritUploads()
4648
Joanna Wang18de1f62023-01-21 01:24:24 +00004649 if options.stacked_exp:
4650 orig_args.remove('--stacked-exp')
4651
4652 UploadAllSquashed(options, orig_args)
4653 return 0
4654
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004655 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004656 # Warm change details cache now to avoid RPCs later, reducing latency for
4657 # developers.
4658 if cl.GetIssue():
4659 cl._GetChangeDetail(
4660 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4661
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004662 if options.retry_failed and not cl.GetIssue():
4663 print('No previous patchsets, so --retry-failed has no effect.')
4664 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004665
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004666 # cl.GetMostRecentPatchset uses cached information, and can return the last
4667 # patchset before upload. Calling it here makes it clear that it's the
4668 # last patchset before upload. Note that GetMostRecentPatchset will fail
4669 # if no CL has been uploaded yet.
4670 if options.retry_failed:
4671 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004672
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004673 ret = cl.CMDUpload(options, args, orig_args)
4674
4675 if options.retry_failed:
4676 if ret != 0:
4677 print('Upload failed, so --retry-failed has no effect.')
4678 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004679 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004680 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004681 jobs = _filter_failed_for_retry(builds)
4682 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004683 print('No failed tryjobs, so --retry-failed has no effect.')
4684 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004685 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004686
4687 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004688
4689
Joanna Wang18de1f62023-01-21 01:24:24 +00004690def UploadAllSquashed(options, orig_args):
4691 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4692 """Uploads the current and upstream branches (if necessary)."""
4693 _cls, _cherry_pick_current = _UploadAllPrecheck(options, orig_args)
4694
4695 # TODO(b/265929888): parse cls and create commits.
4696
4697
4698def _UploadAllPrecheck(options, orig_args):
4699 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4700 """Checks the state of the tree and gives the user uploading options
4701
4702 Returns: A tuple of the ordered list of changes that have new commits
4703 since their last upload and a boolean of whether the user wants to
4704 cherry-pick and upload the current branch instead of uploading all cls.
4705 """
4706 branch_ref = None
4707 cls = []
4708 must_upload_upstream = False
4709
4710 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4711
4712 while True:
4713 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4714 DieWithError(
4715 'More than %s branches in the stack have not been uploaded.\n'
4716 'Are your branches in a misconfigured state?\n'
4717 'If not, please upload some upstream changes first.' %
4718 (_MAX_STACKED_BRANCHES_UPLOAD))
4719
4720 cl = Changelist(branchref=branch_ref)
4721 cls.append(cl)
4722
4723 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
4724 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4725 branch_ref = upstream_branch_ref # set branch for next run.
4726
4727 # Case 1: We've reached the beginning of the tree.
4728 if origin != '.':
4729 break
4730
4731 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4732 upstream_branch,
4733 LAST_UPLOAD_HASH_CONFIG_KEY)
4734
4735 # Case 2: If any upstream branches have never been uploaded,
4736 # the user MUST upload them.
4737 if not upstream_last_upload:
4738 must_upload_upstream = True
4739 continue
4740
4741 base_commit = cl.GetCommonAncestorWithUpstream()
4742
4743 # Case 3: If upstream's last_upload == cl.base_commit we do
4744 # not need to upload any more upstreams from this point on.
4745 # (Even if there may be diverged branches higher up the tree)
4746 if base_commit == upstream_last_upload:
4747 break
4748
4749 # Case 4: If upstream's last_upload < cl.base_commit we are
4750 # uploading cl and upstream_cl.
4751 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004752 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004753 continue
4754
4755 # Case 5: If cl.base_commit < upstream's last_upload the user
4756 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004757 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004758 DieWithError(
4759 'At least one branch in the stack has diverged from its upstream '
4760 'branch and does not contain its upstream\'s last upload.\n'
4761 'Please rebase the stack with `git rebase-update` before uploading.')
4762
4763 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
4764 # any relation to commits in the tree. Continue up the tree until we hit
4765 # the root.
4766
4767 # We assume all cls in the stack have the same auth requirements and only
4768 # check this once.
4769 cls[0].EnsureAuthenticated(force=options.force)
4770
4771 cherry_pick = False
4772 if len(cls) > 1:
4773 message = ''
4774 if len(orig_args):
4775 message = ('options %s will be used for all uploads.\n' % orig_args)
4776 if must_upload_upstream:
4777 confirm_or_exit('\n' + message +
4778 'There are upstream branches that must be uploaded.\n')
4779 else:
4780 answer = gclient_utils.AskForData(
4781 '\n' + message +
4782 'Press enter to update branches %s.\nOr type `n` to upload only '
4783 '`%s` cherry-picked on %s\'s last upload:' %
4784 ([cl.branch for cl in cls], cls[0].branch, cls[1].branch))
4785 if answer.lower() == 'n':
4786 cherry_pick = True
4787 return cls, cherry_pick
4788
4789
Francois Dorayd42c6812017-05-30 15:10:20 -04004790@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004791@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004792def CMDsplit(parser, args):
4793 """Splits a branch into smaller branches and uploads CLs.
4794
4795 Creates a branch and uploads a CL for each group of files modified in the
4796 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004797 comment, the string '$directory', is replaced with the directory containing
4798 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004799 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004800 parser.add_option('-d', '--description', dest='description_file',
4801 help='A text file containing a CL description in which '
4802 '$directory will be replaced by each CL\'s directory.')
4803 parser.add_option('-c', '--comment', dest='comment_file',
4804 help='A text file containing a CL comment.')
4805 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004806 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004807 help='List the files and reviewers for each CL that would '
4808 'be created, but don\'t create branches or CLs.')
4809 parser.add_option('--cq-dry-run', action='store_true',
4810 help='If set, will do a cq dry run for each uploaded CL. '
4811 'Please be careful when doing this; more than ~10 CLs '
4812 'has the potential to overload our build '
4813 'infrastructure. Try to upload these not during high '
4814 'load times (usually 11-3 Mountain View time). Email '
4815 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004816 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4817 default=True,
4818 help='Sends your change to the CQ after an approval. Only '
4819 'works on repos that have the Auto-Submit label '
4820 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004821 parser.add_option('--max-depth',
4822 type='int',
4823 default=0,
4824 help='The max depth to look for OWNERS files. Useful for '
4825 'controlling the granularity of the split CLs, e.g. '
4826 '--max-depth=1 will only split by top-level '
4827 'directory. Specifying a value less than 1 means no '
4828 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004829 options, _ = parser.parse_args(args)
4830
4831 if not options.description_file:
4832 parser.error('No --description flag specified.')
4833
4834 def WrappedCMDupload(args):
4835 return CMDupload(OptionParser(), args)
4836
Daniel Cheng403c44e2022-10-05 22:24:58 +00004837 return split_cl.SplitCl(options.description_file, options.comment_file,
4838 Changelist, WrappedCMDupload, options.dry_run,
4839 options.cq_dry_run, options.enable_auto_submit,
4840 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004841
4842
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004843@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004844@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004845def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004846 """DEPRECATED: Used to commit the current changelist via git-svn."""
4847 message = ('git-cl no longer supports committing to SVN repositories via '
4848 'git-svn. You probably want to use `git cl land` instead.')
4849 print(message)
4850 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004851
4852
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004853@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004854@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004855def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004856 """Commits the current changelist via git.
4857
4858 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4859 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004860 """
4861 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4862 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004863 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004864 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004865 parser.add_option('--parallel', action='store_true',
4866 help='Run all tests specified by input_api.RunTests in all '
4867 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004868 parser.add_option('--resultdb', action='store_true',
4869 help='Run presubmit checks in the ResultSink environment '
4870 'and send results to the ResultDB database.')
4871 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004872 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004873
Edward Lemur934836a2019-09-09 20:16:54 +00004874 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004875
Robert Iannucci2e73d432018-03-14 01:10:47 -07004876 if not cl.GetIssue():
4877 DieWithError('You must upload the change first to Gerrit.\n'
4878 ' If you would rather have `git cl land` upload '
4879 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004880 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4881 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004882
4883
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004884@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004885@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004886def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004887 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004888 parser.add_option('-b', dest='newbranch',
4889 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004890 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004891 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004892 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004893 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004894
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004895 group = optparse.OptionGroup(
4896 parser,
4897 'Options for continuing work on the current issue uploaded from a '
4898 'different clone (e.g. different machine). Must be used independently '
4899 'from the other options. No issue number should be specified, and the '
4900 'branch must have an issue number associated with it')
4901 group.add_option('--reapply', action='store_true', dest='reapply',
4902 help='Reset the branch and reapply the issue.\n'
4903 'CAUTION: This will undo any local changes in this '
4904 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004905
4906 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004907 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004908 parser.add_option_group(group)
4909
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004910 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004911
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004912 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004913 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004914 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004915 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004916 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004917
Edward Lemur934836a2019-09-09 20:16:54 +00004918 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004919 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004920 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004921
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004922 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004923 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004924 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004925
4926 RunGit(['reset', '--hard', upstream])
4927 if options.pull:
4928 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004929
Edward Lemur678a6842019-10-03 22:25:05 +00004930 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004931 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4932 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004933
4934 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004935 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004936
Edward Lemurf38bc172019-09-03 21:02:13 +00004937 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004938 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004939 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004940
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004941 # We don't want uncommitted changes mixed up with the patch.
4942 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004943 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004944
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004945 if options.newbranch:
4946 if options.force:
4947 RunGit(['branch', '-D', options.newbranch],
4948 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004949 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004950
Edward Lemur678a6842019-10-03 22:25:05 +00004951 cl = Changelist(
4952 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004953
Edward Lemur678a6842019-10-03 22:25:05 +00004954 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004955 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004956
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004957 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4958 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004959
4960
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004961def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004962 """Fetches the tree status and returns either 'open', 'closed',
4963 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004964 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004965 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004966 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004967 if status.find('closed') != -1 or status == '0':
4968 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004969
4970 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004971 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004973 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004974 return 'unset'
4975
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004976
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004977def GetTreeStatusReason():
4978 """Fetches the tree status from a json url and returns the message
4979 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004980 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004981 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004982 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004983 status = json.loads(connection.read())
4984 connection.close()
4985 return status['message']
4986
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004987
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004988@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004989def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004990 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004991 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004992 status = GetTreeStatus()
4993 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004994 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004995 return 2
4996
vapiera7fbd5a2016-06-16 09:17:49 -07004997 print('The tree is %s' % status)
4998 print()
4999 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005000 if status != 'open':
5001 return 1
5002 return 0
5003
5004
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005005@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005006def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005007 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5008 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005009 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005010 '-b', '--bot', action='append',
5011 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5012 'times to specify multiple builders. ex: '
5013 '"-b win_rel -b win_layout". See '
5014 'the try server waterfall for the builders name and the tests '
5015 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005016 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005017 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005018 help=('Buildbucket bucket to send the try requests. Format: '
5019 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005020 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005021 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005022 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005023 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005024 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005025 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005026 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005027 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005028 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005029 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005030 '-q',
5031 '--quick-run',
5032 action='store_true',
5033 default=False,
5034 help='trigger in quick run mode '
5035 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5036 'uick_run.md) (chromium only).')
5037 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005038 '--category', default='git_cl_try', help='Specify custom build category.')
5039 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005040 '--project',
5041 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005042 'in recipe to determine to which repository or directory to '
5043 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005044 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005045 '-p', '--property', dest='properties', action='append', default=[],
5046 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005047 'key2=value2 etc. The value will be treated as '
5048 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005049 'NOTE: using this may make your tryjob not usable for CQ, '
5050 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005051 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005052 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5053 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005054 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005055 parser.add_option(
5056 '-R', '--retry-failed', action='store_true', default=False,
5057 help='Retry failed jobs from the latest set of tryjobs. '
5058 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005059 parser.add_option(
5060 '-i', '--issue', type=int,
5061 help='Operate on this issue instead of the current branch\'s implicit '
5062 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005063 options, args = parser.parse_args(args)
5064
machenbach@chromium.org45453142015-09-15 08:45:22 +00005065 # Make sure that all properties are prop=value pairs.
5066 bad_params = [x for x in options.properties if '=' not in x]
5067 if bad_params:
5068 parser.error('Got properties with missing "=": %s' % bad_params)
5069
maruel@chromium.org15192402012-09-06 12:38:29 +00005070 if args:
5071 parser.error('Unknown arguments: %s' % args)
5072
Edward Lemur934836a2019-09-09 20:16:54 +00005073 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005074 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005075 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005076
Edward Lemurf38bc172019-09-03 21:02:13 +00005077 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005078 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005079
tandriie113dfd2016-10-11 10:20:12 -07005080 error_message = cl.CannotTriggerTryJobReason()
5081 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005082 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005083
Edward Lemur45768512020-03-02 19:03:14 +00005084 if options.bot:
5085 if options.retry_failed:
5086 parser.error('--bot is not compatible with --retry-failed.')
5087 if not options.bucket:
5088 parser.error('A bucket (e.g. "chromium/try") is required.')
5089
5090 triggered = [b for b in options.bot if 'triggered' in b]
5091 if triggered:
5092 parser.error(
5093 'Cannot schedule builds on triggered bots: %s.\n'
5094 'This type of bot requires an initial job from a parent (usually a '
5095 'builder). Schedule a job on the parent instead.\n' % triggered)
5096
5097 if options.bucket.startswith('.master'):
5098 parser.error('Buildbot masters are not supported.')
5099
5100 project, bucket = _parse_bucket(options.bucket)
5101 if project is None or bucket is None:
5102 parser.error('Invalid bucket: %s.' % options.bucket)
5103 jobs = sorted((project, bucket, bot) for bot in options.bot)
5104 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005105 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00005106 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005107 if options.verbose:
5108 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005109 jobs = _filter_failed_for_retry(builds)
5110 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005111 print('There are no failed jobs in the latest set of jobs '
5112 '(patchset #%d), doing nothing.' % patchset)
5113 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005114 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005115 if num_builders > 10:
5116 confirm_or_exit('There are %d builders with failed builds.'
5117 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005118 elif options.quick_run:
5119 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5120 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005121 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005122 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005123 print('git cl try with no bots now defaults to CQ dry run.')
5124 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5125 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005126
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005127 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005128 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005129 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005130 except BuildbucketResponseException as ex:
5131 print('ERROR: %s' % ex)
5132 return 1
5133 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005134
5135
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005136@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005137def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005138 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005139 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005140 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005141 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005142 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005143 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005144 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005145 '--color', action='store_true', default=setup_color.IS_TTY,
5146 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005147 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005148 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5149 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005150 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005151 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005152 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005153 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005154 parser.add_option(
5155 '-i', '--issue', type=int,
5156 help='Operate on this issue instead of the current branch\'s implicit '
5157 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005158 options, args = parser.parse_args(args)
5159 if args:
5160 parser.error('Unrecognized args: %s' % ' '.join(args))
5161
Edward Lemur934836a2019-09-09 20:16:54 +00005162 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005163 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005164 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005165
tandrii221ab252016-10-06 08:12:04 -07005166 patchset = options.patchset
5167 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005168 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005169 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005170 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005171 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005172 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005173 cl.GetIssue())
5174
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005175 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005176 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005177 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005178 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005179 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005180 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005181 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005182 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005183 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005184 return 0
5185
5186
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005187@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005188@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005189def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005190 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005191 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005192 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005193 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005196 if args:
5197 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005198 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005199 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005200 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005201 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005202
5203 # Clear configured merge-base, if there is one.
5204 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005205 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005206 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207 return 0
5208
5209
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005210@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005211def CMDweb(parser, args):
5212 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005213 parser.add_option('-p',
5214 '--print-only',
5215 action='store_true',
5216 dest='print_only',
5217 help='Only print the Gerrit URL, don\'t open it in the '
5218 'browser.')
5219 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005220 if args:
5221 parser.error('Unrecognized args: %s' % ' '.join(args))
5222
5223 issue_url = Changelist().GetIssueURL()
5224 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005225 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005226 return 1
5227
Orr Bernstein0b960582022-12-22 20:16:18 +00005228 if options.print_only:
5229 print(issue_url)
5230 return 0
5231
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005232 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005233 # allows us to hide the "Created new window in existing browser session."
5234 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005235 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005236 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005237 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005238 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005239 os.open(os.devnull, os.O_RDWR)
5240 try:
5241 webbrowser.open(issue_url)
5242 finally:
5243 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005244 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005245 return 0
5246
5247
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005248@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005249def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005250 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005251 parser.add_option('-d', '--dry-run', action='store_true',
5252 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005253 parser.add_option(
5254 '-q',
5255 '--quick-run',
5256 action='store_true',
5257 help='trigger in quick run mode '
5258 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5259 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005260 parser.add_option('-c', '--clear', action='store_true',
5261 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005262 parser.add_option(
5263 '-i', '--issue', type=int,
5264 help='Operate on this issue instead of the current branch\'s implicit '
5265 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005266 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005267 if args:
5268 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005269 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5270 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005271
Edward Lemur934836a2019-09-09 20:16:54 +00005272 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005273 if not cl.GetIssue():
5274 parser.error('Must upload the issue first.')
5275
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005276 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005277 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005278 elif options.quick_run:
5279 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005280 elif options.dry_run:
5281 state = _CQState.DRY_RUN
5282 else:
5283 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005284 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005285 return 0
5286
5287
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005288@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005289def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005290 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005291 parser.add_option(
5292 '-i', '--issue', type=int,
5293 help='Operate on this issue instead of the current branch\'s implicit '
5294 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005295 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005296 if args:
5297 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005298 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005299 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005300 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005301 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005302 cl.CloseIssue()
5303 return 0
5304
5305
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005306@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005307def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005308 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005309 parser.add_option(
5310 '--stat',
5311 action='store_true',
5312 dest='stat',
5313 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005314 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005315 if args:
5316 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005317
Edward Lemur934836a2019-09-09 20:16:54 +00005318 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005319 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005320 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005321 if not issue:
5322 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005323
Gavin Makbe2e9262022-11-08 23:41:55 +00005324 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005325 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005326 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005327 if not base:
5328 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5329 revision_info = detail['revisions'][detail['current_revision']]
5330 fetch_info = revision_info['fetch']['http']
5331 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5332 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005333
Aaron Gablea718c3e2017-08-28 17:47:28 -07005334 cmd = ['git', 'diff']
5335 if options.stat:
5336 cmd.append('--stat')
5337 cmd.append(base)
5338 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005339
5340 return 0
5341
5342
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005343@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005344def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005345 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005346 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005347 '--ignore-current',
5348 action='store_true',
5349 help='Ignore the CL\'s current reviewers and start from scratch.')
5350 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005351 '--ignore-self',
5352 action='store_true',
5353 help='Do not consider CL\'s author as an owners.')
5354 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005355 '--no-color',
5356 action='store_true',
5357 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005358 parser.add_option(
5359 '--batch',
5360 action='store_true',
5361 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005362 # TODO: Consider moving this to another command, since other
5363 # git-cl owners commands deal with owners for a given CL.
5364 parser.add_option(
5365 '--show-all',
5366 action='store_true',
5367 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005368 options, args = parser.parse_args(args)
5369
Edward Lemur934836a2019-09-09 20:16:54 +00005370 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005371 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005372
Yang Guo6e269a02019-06-26 11:17:02 +00005373 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005374 if len(args) == 0:
5375 print('No files specified for --show-all. Nothing to do.')
5376 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005377 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005378 for path in args:
5379 print('Owners for %s:' % path)
5380 print('\n'.join(
5381 ' - %s' % owner
5382 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005383 return 0
5384
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005385 if args:
5386 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005387 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005388 base_branch = args[0]
5389 else:
5390 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005391 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005392
Edward Lemur2c62b332020-03-12 22:12:33 +00005393 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005394
5395 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005396 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5397 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005398 return 0
5399
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005400 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005401 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005402 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005403 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005404 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005405 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005406 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005407
5408
Aiden Bennerc08566e2018-10-03 17:52:42 +00005409def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005410 """Generates a diff command."""
5411 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005412 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5413
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005414 if allow_prefix:
5415 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5416 # case that diff.noprefix is set in the user's git config.
5417 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5418 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005419 diff_cmd += ['--no-prefix']
5420
5421 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005422
5423 if args:
5424 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005425 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005426 diff_cmd.append(arg)
5427 else:
5428 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005429
5430 return diff_cmd
5431
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005432
Jamie Madill5e96ad12020-01-13 16:08:35 +00005433def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5434 """Runs clang-format-diff and sets a return value if necessary."""
5435
5436 if not clang_diff_files:
5437 return 0
5438
5439 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5440 # formatted. This is used to block during the presubmit.
5441 return_value = 0
5442
5443 # Locate the clang-format binary in the checkout
5444 try:
5445 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5446 except clang_format.NotFoundError as e:
5447 DieWithError(e)
5448
5449 if opts.full or settings.GetFormatFullByDefault():
5450 cmd = [clang_format_tool]
5451 if not opts.dry_run and not opts.diff:
5452 cmd.append('-i')
5453 if opts.dry_run:
5454 for diff_file in clang_diff_files:
5455 with open(diff_file, 'r') as myfile:
5456 code = myfile.read().replace('\r\n', '\n')
5457 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5458 stdout = stdout.replace('\r\n', '\n')
5459 if opts.diff:
5460 sys.stdout.write(stdout)
5461 if code != stdout:
5462 return_value = 2
5463 else:
5464 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5465 if opts.diff:
5466 sys.stdout.write(stdout)
5467 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005468 try:
5469 script = clang_format.FindClangFormatScriptInChromiumTree(
5470 'clang-format-diff.py')
5471 except clang_format.NotFoundError as e:
5472 DieWithError(e)
5473
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005474 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005475 if not opts.dry_run and not opts.diff:
5476 cmd.append('-i')
5477
5478 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005479 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005480
Edward Lesmes89624cd2020-04-06 17:51:56 +00005481 env = os.environ.copy()
5482 env['PATH'] = (
5483 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5484 stdout = RunCommand(
5485 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005486 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005487 if opts.diff:
5488 sys.stdout.write(stdout)
5489 if opts.dry_run and len(stdout) > 0:
5490 return_value = 2
5491
5492 return return_value
5493
5494
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005495def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5496 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5497 presubmit checks have failed (and returns 0 otherwise)."""
5498
5499 if not rust_diff_files:
5500 return 0
5501
5502 # Locate the rustfmt binary.
5503 try:
5504 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5505 except rustfmt.NotFoundError as e:
5506 DieWithError(e)
5507
5508 # TODO(crbug.com/1231317): Support formatting only the changed lines
5509 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5510 # https://github.com/emilio/rustfmt-format-diff
5511 cmd = [rustfmt_tool]
5512 if opts.dry_run:
5513 cmd.append('--check')
5514 cmd += rust_diff_files
5515 rustfmt_exitcode = subprocess2.call(cmd)
5516
5517 if opts.presubmit and rustfmt_exitcode != 0:
5518 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005519
5520 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005521
5522
Olivier Robin0a6b5442022-04-07 07:25:04 +00005523def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5524 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5525 that presubmit checks have failed (and returns 0 otherwise)."""
5526
5527 if not swift_diff_files:
5528 return 0
5529
5530 # Locate the swift-format binary.
5531 try:
5532 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5533 except swift_format.NotFoundError as e:
5534 DieWithError(e)
5535
5536 cmd = [swift_format_tool]
5537 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005538 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005539 else:
5540 cmd += ['format', '-i']
5541 cmd += swift_diff_files
5542 swift_format_exitcode = subprocess2.call(cmd)
5543
5544 if opts.presubmit and swift_format_exitcode != 0:
5545 return 2
5546
5547 return 0
5548
5549
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005550def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005551 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005552 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005553
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005554
enne@chromium.org555cfe42014-01-29 18:21:39 +00005555@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005556@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005557def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005558 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005559 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005560 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005561 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005562 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005563 parser.add_option('--full', action='store_true',
5564 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005565 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005566 parser.add_option('--dry-run', action='store_true',
5567 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005568 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005569 '--no-clang-format',
5570 dest='clang_format',
5571 action='store_false',
5572 default=True,
5573 help='Disables formatting of various file types using clang-format.')
5574 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005575 '--python',
5576 action='store_true',
5577 default=None,
5578 help='Enables python formatting on all python files.')
5579 parser.add_option(
5580 '--no-python',
5581 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005582 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005583 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005584 'If neither --python or --no-python are set, python files that have a '
5585 '.style.yapf file in an ancestor directory will be formatted. '
5586 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005587 parser.add_option(
5588 '--js',
5589 action='store_true',
5590 help='Format javascript code with clang-format. '
5591 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005592 parser.add_option('--diff', action='store_true',
5593 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005594 parser.add_option('--presubmit', action='store_true',
5595 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005596
5597 parser.add_option('--rust-fmt',
5598 dest='use_rust_fmt',
5599 action='store_true',
5600 default=rustfmt.IsRustfmtSupported(),
5601 help='Enables formatting of Rust file types using rustfmt.')
5602 parser.add_option(
5603 '--no-rust-fmt',
5604 dest='use_rust_fmt',
5605 action='store_false',
5606 help='Disables formatting of Rust file types using rustfmt.')
5607
Olivier Robin0a6b5442022-04-07 07:25:04 +00005608 parser.add_option(
5609 '--swift-format',
5610 dest='use_swift_format',
5611 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005612 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005613 help='Enables formatting of Swift file types using swift-format '
5614 '(macOS host only).')
5615 parser.add_option(
5616 '--no-swift-format',
5617 dest='use_swift_format',
5618 action='store_false',
5619 help='Disables formatting of Swift file types using swift-format.')
5620
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005621 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005622
Garrett Beaty91a6f332020-01-06 16:57:24 +00005623 if opts.python is not None and opts.no_python:
5624 raise parser.error('Cannot set both --python and --no-python')
5625 if opts.no_python:
5626 opts.python = False
5627
Daniel Chengc55eecf2016-12-30 03:11:02 -08005628 # Normalize any remaining args against the current path, so paths relative to
5629 # the current directory are still resolved as expected.
5630 args = [os.path.join(os.getcwd(), arg) for arg in args]
5631
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005632 # git diff generates paths against the root of the repository. Change
5633 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005634 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005635 if rel_base_path:
5636 os.chdir(rel_base_path)
5637
digit@chromium.org29e47272013-05-17 17:01:46 +00005638 # Grab the merge-base commit, i.e. the upstream commit of the current
5639 # branch when it was created or the last time it was rebased. This is
5640 # to cover the case where the user may have called "git fetch origin",
5641 # moving the origin branch to a newer commit, but hasn't rebased yet.
5642 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005643 upstream_branch = opts.upstream
5644 if not upstream_branch:
5645 cl = Changelist()
5646 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005647 if upstream_branch:
5648 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5649 upstream_commit = upstream_commit.strip()
5650
5651 if not upstream_commit:
5652 DieWithError('Could not find base commit for this branch. '
5653 'Are you in detached state?')
5654
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005655 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5656 diff_output = RunGit(changed_files_cmd)
5657 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005658 # Filter out files deleted by this CL
5659 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005660
Andreas Haas417d89c2020-02-06 10:24:27 +00005661 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005662 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005663
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005664 clang_diff_files = []
5665 if opts.clang_format:
5666 clang_diff_files = [
5667 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5668 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005669 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005670 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005671 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005672 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005673
Edward Lesmes50da7702020-03-30 19:23:43 +00005674 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005675
Jamie Madill5e96ad12020-01-13 16:08:35 +00005676 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5677 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005678
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005679 if opts.use_rust_fmt:
5680 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5681 upstream_commit)
5682 if rust_fmt_return_value == 2:
5683 return_value = 2
5684
Olivier Robin0a6b5442022-04-07 07:25:04 +00005685 if opts.use_swift_format:
5686 if sys.platform != 'darwin':
5687 DieWithError('swift-format is only supported on macOS.')
5688 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5689 upstream_commit)
5690 if swift_format_return_value == 2:
5691 return_value = 2
5692
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005693 # Similar code to above, but using yapf on .py files rather than clang-format
5694 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005695 py_explicitly_disabled = opts.python is not None and not opts.python
5696 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005697 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5698 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005699
Aiden Bennerc08566e2018-10-03 17:52:42 +00005700 # Used for caching.
5701 yapf_configs = {}
5702 for f in python_diff_files:
5703 # Find the yapf style config for the current file, defaults to depot
5704 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005705 _FindYapfConfigFile(f, yapf_configs, top_dir)
5706
5707 # Turn on python formatting by default if a yapf config is specified.
5708 # This breaks in the case of this repo though since the specified
5709 # style file is also the global default.
5710 if opts.python is None:
5711 filtered_py_files = []
5712 for f in python_diff_files:
5713 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5714 filtered_py_files.append(f)
5715 else:
5716 filtered_py_files = python_diff_files
5717
5718 # Note: yapf still seems to fix indentation of the entire file
5719 # even if line ranges are specified.
5720 # See https://github.com/google/yapf/issues/499
5721 if not opts.full and filtered_py_files:
5722 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5723
Brian Sheedyb4307d52019-12-02 19:18:17 +00005724 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5725 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5726 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005727
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005728 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005729 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5730 # Default to pep8 if not .style.yapf is found.
5731 if not yapf_style:
5732 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005733
Peter Wend9399922020-06-17 17:33:49 +00005734 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005735 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005736 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005737 else:
5738 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005739
5740 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005741
5742 has_formattable_lines = False
5743 if not opts.full:
5744 # Only run yapf over changed line ranges.
5745 for diff_start, diff_len in py_line_diffs[f]:
5746 diff_end = diff_start + diff_len - 1
5747 # Yapf errors out if diff_end < diff_start but this
5748 # is a valid line range diff for a removal.
5749 if diff_end >= diff_start:
5750 has_formattable_lines = True
5751 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5752 # If all line diffs were removals we have nothing to format.
5753 if not has_formattable_lines:
5754 continue
5755
5756 if opts.diff or opts.dry_run:
5757 cmd += ['--diff']
5758 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005759 stdout = RunCommand(cmd,
5760 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005761 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005762 cwd=top_dir,
5763 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005764 if opts.diff:
5765 sys.stdout.write(stdout)
5766 elif len(stdout) > 0:
5767 return_value = 2
5768 else:
5769 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005770 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005771
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005772 # Format GN build files. Always run on full build files for canonical form.
5773 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005774 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005775 if opts.dry_run or opts.diff:
5776 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005777 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005778 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005779 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005780 cwd=top_dir)
5781 if opts.dry_run and gn_ret == 2:
5782 return_value = 2 # Not formatted.
5783 elif opts.diff and gn_ret == 2:
5784 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005785 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005786 elif gn_ret != 0:
5787 # For non-dry run cases (and non-2 return values for dry-run), a
5788 # nonzero error code indicates a failure, probably because the file
5789 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005790 DieWithError('gn format failed on ' + gn_diff_file +
5791 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005792
Ilya Shermane081cbe2017-08-15 17:51:04 -07005793 # Skip the metrics formatting from the global presubmit hook. These files have
5794 # a separate presubmit hook that issues an error if the files need formatting,
5795 # whereas the top-level presubmit script merely issues a warning. Formatting
5796 # these files is somewhat slow, so it's important not to duplicate the work.
5797 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005798 for diff_xml in GetDiffXMLs(diff_files):
5799 xml_dir = GetMetricsDir(diff_xml)
5800 if not xml_dir:
5801 continue
5802
Ilya Shermane081cbe2017-08-15 17:51:04 -07005803 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005804 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005805 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005806
5807 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5808 # command as histograms/pretty_print.py now needs a relative path argument
5809 # after splitting the histograms into multiple directories.
5810 # For example, in tools/metrics/ukm, pretty-print could be run using:
5811 # $ python pretty_print.py
5812 # But in tools/metrics/histogrmas, pretty-print should be run with an
5813 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005814 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005815 # $ python pretty_print.py enums.xml
5816
Weilun Shib92c4b72020-08-27 17:45:11 +00005817 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005818 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005819 cmd.append(diff_xml)
5820
Ilya Shermane081cbe2017-08-15 17:51:04 -07005821 if opts.dry_run or opts.diff:
5822 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005823
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005824 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5825 # `shell` param and instead replace `'vpython'` with
5826 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005827 stdout = RunCommand(cmd,
5828 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005829 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005830 if opts.diff:
5831 sys.stdout.write(stdout)
5832 if opts.dry_run and stdout:
5833 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005834
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005835 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005836
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005837
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005838def GetDiffXMLs(diff_files):
5839 return [
5840 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5841 ]
5842
5843
5844def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005845 metrics_xml_dirs = [
5846 os.path.join('tools', 'metrics', 'actions'),
5847 os.path.join('tools', 'metrics', 'histograms'),
5848 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005849 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005850 os.path.join('tools', 'metrics', 'ukm'),
5851 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005852 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005853 if diff_xml.startswith(xml_dir):
5854 return xml_dir
5855 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005856
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005857
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005858@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005859@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005860def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005861 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005862 _, args = parser.parse_args(args)
5863
5864 if len(args) != 1:
5865 parser.print_help()
5866 return 1
5867
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005868 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005869 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005870 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005871
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005872 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005873
Edward Lemur52969c92020-02-06 18:15:28 +00005874 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005875 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005876 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005877
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005878 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005879 for key, issue in [x.split() for x in output.splitlines()]:
5880 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005881 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005882
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005883 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005884 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005885 return 1
5886 if len(branches) == 1:
5887 RunGit(['checkout', branches[0]])
5888 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005889 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005890 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005891 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005892 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005893 try:
5894 RunGit(['checkout', branches[int(which)]])
5895 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005896 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005897 return 1
5898
5899 return 0
5900
5901
maruel@chromium.org29404b52014-09-08 22:58:00 +00005902def CMDlol(parser, args):
5903 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005904 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005905 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5906 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5907 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005908 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005909 return 0
5910
5911
Josip Sokcevic0399e172022-03-21 23:11:51 +00005912def CMDversion(parser, args):
5913 import utils
5914 print(utils.depot_tools_version())
5915
5916
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005917class OptionParser(optparse.OptionParser):
5918 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005919
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005920 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005921 optparse.OptionParser.__init__(
5922 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005923 self.add_option(
5924 '-v', '--verbose', action='count', default=0,
5925 help='Use 2 times for more debugging info')
5926
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005927 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005928 try:
5929 return self._parse_args(args)
5930 finally:
5931 # Regardless of success or failure of args parsing, we want to report
5932 # metrics, but only after logging has been initialized (if parsing
5933 # succeeded).
5934 global settings
5935 settings = Settings()
5936
Edward Lesmes9c349062021-05-06 20:02:39 +00005937 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005938 # GetViewVCUrl ultimately calls logging method.
5939 project_url = settings.GetViewVCUrl().strip('/+')
5940 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5941 metrics.collector.add('project_urls', [project_url])
5942
5943 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005944 # Create an optparse.Values object that will store only the actual passed
5945 # options, without the defaults.
5946 actual_options = optparse.Values()
5947 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5948 # Create an optparse.Values object with the default options.
5949 options = optparse.Values(self.get_default_values().__dict__)
5950 # Update it with the options passed by the user.
5951 options._update_careful(actual_options.__dict__)
5952 # Store the options passed by the user in an _actual_options attribute.
5953 # We store only the keys, and not the values, since the values can contain
5954 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005955 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005956
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005957 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005958 logging.basicConfig(
5959 level=levels[min(options.verbose, len(levels) - 1)],
5960 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5961 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005962
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005963 return options, args
5964
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005965
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005966def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005967 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005968 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005969 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005970 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005971
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005972 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005973 dispatcher = subcommand.CommandDispatcher(__name__)
5974 try:
5975 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005976 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005977 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005978 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005979 if e.code != 500:
5980 raise
5981 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005982 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005983 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005984 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005985
5986
5987if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005988 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5989 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005990 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005991 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005992 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005993 sys.exit(main(sys.argv[1:]))