blob: c070e5907ef912af94a4b06cffff8fcaabbaab05 [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
Joanna Wange8523912023-01-21 02:05:40 +00001002_NewUpload = collections.namedtuple('NewUpload', [
1003 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit',
1004 'change_desc'
1005])
1006
1007
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001009 """Changelist works with one changelist in local branch.
1010
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001011 Notes:
1012 * Not safe for concurrent multi-{thread,process} use.
1013 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001014 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001015 """
1016
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001017 def __init__(self,
1018 branchref=None,
1019 issue=None,
1020 codereview_host=None,
1021 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 """Create a new ChangeList instance.
1023
Edward Lemurf38bc172019-09-03 21:02:13 +00001024 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001027 global settings
1028 if not settings:
1029 # Happens when git_cl.py is used as a utility library.
1030 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001031
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032 self.branchref = branchref
1033 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001034 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001035 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 else:
1037 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001038 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001040 self.lookedup_issue = False
1041 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001043 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001045 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001046 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001047 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001048 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001049
Edward Lemur125d60a2019-09-13 18:25:41 +00001050 # Lazily cached values.
1051 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1052 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001053 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001054 # Map from change number (issue) to its detail cache.
1055 self._detail_cache = {}
1056
1057 if codereview_host is not None:
1058 assert not codereview_host.startswith('https://'), codereview_host
1059 self._gerrit_host = codereview_host
1060 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061
Edward Lesmese1576912021-02-16 21:53:34 +00001062 @property
1063 def owners_client(self):
1064 if self._owners_client is None:
1065 remote, remote_branch = self.GetRemoteBranch()
1066 branch = GetTargetRef(remote, remote_branch, None)
1067 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001068 host=self.GetGerritHost(),
1069 project=self.GetGerritProject(),
1070 branch=branch)
1071 return self._owners_client
1072
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001073 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001074 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001075
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001076 The return value is a string suitable for passing to git cl with the --cc
1077 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001078 """
1079 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001080 base_cc = settings.GetDefaultCCList()
1081 more_cc = ','.join(self.more_cc)
1082 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001083 return self.cc
1084
Daniel Cheng7227d212017-11-17 08:12:37 -08001085 def ExtendCC(self, more_cc):
1086 """Extends the list of users to cc on this CL based on the changed files."""
1087 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001089 def GetCommitDate(self):
1090 """Returns the commit date as provided in the constructor"""
1091 return self.commit_date
1092
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001094 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001095 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001096 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001097 if not branchref:
1098 return None
1099 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001100 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101 return self.branch
1102
1103 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001104 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 self.GetBranch() # Poke the lazy loader.
1106 return self.branchref
1107
Edward Lemur85153282020-02-14 22:06:29 +00001108 def _GitGetBranchConfigValue(self, key, default=None):
1109 return scm.GIT.GetBranchConfig(
1110 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001111
Edward Lemur85153282020-02-14 22:06:29 +00001112 def _GitSetBranchConfigValue(self, key, value):
1113 action = 'set %s to %r' % (key, value)
1114 if not value:
1115 action = 'unset %s' % key
1116 assert self.GetBranch(), 'a branch is needed to ' + action
1117 return scm.GIT.SetBranchConfig(
1118 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001119
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001120 @staticmethod
1121 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001122 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001123 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001125 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1126 settings.GetRoot(), branch)
1127 if not remote or not upstream_branch:
1128 DieWithError(
1129 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001130 'Verify this branch is set up to track another \n'
1131 '(via the --track argument to "git checkout -b ..."). \n'
1132 'or pass complete "git diff"-style arguments if supported, like\n'
1133 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134
1135 return remote, upstream_branch
1136
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001137 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001138 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001139 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001140 DieWithError('The upstream for the current branch (%s) does not exist '
1141 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001142 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001143 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001144
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 def GetUpstreamBranch(self):
1146 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001147 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001148 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001149 upstream_branch = upstream_branch.replace('refs/heads/',
1150 'refs/remotes/%s/' % remote)
1151 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1152 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.upstream_branch = upstream_branch
1154 return self.upstream_branch
1155
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001157 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote, branch = None, self.GetBranch()
1159 seen_branches = set()
1160 while branch not in seen_branches:
1161 seen_branches.add(branch)
1162 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001163 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001164 if remote != '.' or branch.startswith('refs/remotes'):
1165 break
1166 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001167 remotes = RunGit(['remote'], error_ok=True).split()
1168 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001170 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001172 logging.warning('Could not determine which remote this change is '
1173 'associated with, so defaulting to "%s".' %
1174 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 else:
Gavin Make6a62332020-12-04 21:57:10 +00001176 logging.warning('Could not determine which remote this change is '
1177 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 branch = 'HEAD'
1179 if branch.startswith('refs/remotes'):
1180 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001181 elif branch.startswith('refs/branch-heads/'):
1182 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001183 else:
1184 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 return self._remote
1186
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187 def GetRemoteUrl(self):
1188 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1189
1190 Returns None if there is no remote.
1191 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001192 is_cached, value = self._cached_remote_url
1193 if is_cached:
1194 return value
1195
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001197 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001198
Edward Lemur298f2cf2019-02-22 21:40:39 +00001199 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001200 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001201 if host:
1202 self._cached_remote_url = (True, url)
1203 return url
1204
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001205 # If it cannot be parsed as an url, assume it is a local directory,
1206 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001207 logging.warning('"%s" doesn\'t appear to point to a git host. '
1208 'Interpreting it as a local directory.', url)
1209 if not os.path.isdir(url):
1210 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001211 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1212 'but it doesn\'t exist.',
1213 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001214 return None
1215
1216 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001217 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218
Edward Lemur79d4f992019-11-11 23:49:02 +00001219 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001220 if not host:
1221 logging.error(
1222 'Remote "%(remote)s" for branch "%(branch)s" points to '
1223 '"%(cache_path)s", but it is misconfigured.\n'
1224 '"%(cache_path)s" must be a git repo and must have a remote named '
1225 '"%(remote)s" pointing to the git host.', {
1226 'remote': remote,
1227 'cache_path': cache_path,
1228 'branch': self.GetBranch()})
1229 return None
1230
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001231 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001232 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001234 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001235 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001236 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001237 if self.GetBranch():
1238 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001239 if self.issue is not None:
1240 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001241 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 return self.issue
1243
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001244 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001246 issue = self.GetIssue()
1247 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001248 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001249 server = self.GetCodereviewServer()
1250 if short:
1251 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1252 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253
Dirk Pranke6f0df682021-06-25 00:42:33 +00001254 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001255 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001256
Edward Lemur6c6827c2020-02-06 21:15:18 +00001257 def FetchDescription(self, pretty=False):
1258 assert self.GetIssue(), 'issue is required to query Gerrit'
1259
Edward Lemur9aa1a962020-02-25 00:58:38 +00001260 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001261 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1262 current_rev = data['current_revision']
1263 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001264
1265 if not pretty:
1266 return self.description
1267
1268 # Set width to 72 columns + 2 space indent.
1269 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1270 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1271 lines = self.description.splitlines()
1272 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273
1274 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001275 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001276 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001277 if self.GetBranch():
1278 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001279 if self.patchset is not None:
1280 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001281 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001282 return self.patchset
1283
Edward Lemur9aa1a962020-02-25 00:58:38 +00001284 def GetAuthor(self):
1285 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1286
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001287 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001288 """Set this branch's patchset. If patchset=0, clears the patchset."""
1289 assert self.GetBranch()
1290 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001292 else:
1293 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001294 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001296 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001297 """Set this branch's issue. If issue isn't given, clears the issue."""
1298 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001300 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001301 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001302 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001303 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001304 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001305 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001306 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 else:
tandrii5d48c322016-08-18 16:19:37 -07001308 # Reset all of these just to be clean.
1309 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001310 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001311 ISSUE_CONFIG_KEY,
1312 PATCHSET_CONFIG_KEY,
1313 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001314 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001315 ]
tandrii5d48c322016-08-18 16:19:37 -07001316 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001317 try:
1318 self._GitSetBranchConfigValue(prop, None)
1319 except subprocess2.CalledProcessError:
1320 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001321 msg = RunGit(['log', '-1', '--format=%B']).strip()
1322 if msg and git_footers.get_footer_change_id(msg):
1323 print('WARNING: The change patched into this branch has a Change-Id. '
1324 'Removing it.')
1325 RunGit(['commit', '--amend', '-m',
1326 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001327 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001328 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001329 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001330
Joanna Wangb46232e2023-01-21 01:58:46 +00001331 def GetAffectedFiles(self, upstream, end_commit=None):
1332 # type: (str, Optional[str]) -> Sequence[str]
1333 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001334 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001335 return [
1336 f for _, f in scm.GIT.CaptureStatus(
1337 settings.GetRoot(), upstream, end_commit=end_commit)
1338 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001339 except subprocess2.CalledProcessError:
1340 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001341 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001342 'This branch probably doesn\'t exist anymore. To reset the\n'
1343 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001344 ' git branch --set-upstream-to origin/main %s\n'
1345 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001346 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001347
dsansomee2d6fd92016-09-08 00:10:47 -07001348 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001349 assert self.GetIssue(), 'issue is required to update description'
1350
1351 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001352 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001353 if not force:
1354 confirm_or_exit(
1355 'The description cannot be modified while the issue has a pending '
1356 'unpublished edit. Either publish the edit in the Gerrit web UI '
1357 'or delete it.\n\n', action='delete the unpublished edit')
1358
1359 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001360 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001361 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001362 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001363 description, notify='NONE')
1364
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001365 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366
Edward Lemur75526302020-02-27 22:31:05 +00001367 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001368 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001369 '--root', settings.GetRoot(),
1370 '--upstream', upstream,
1371 ]
1372
1373 args.extend(['--verbose'] * verbose)
1374
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001375 remote, remote_branch = self.GetRemoteBranch()
1376 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001377 if settings.GetIsGerrit():
1378 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1379 args.extend(['--gerrit_project', self.GetGerritProject()])
1380 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001381
Edward Lemur99df04e2020-03-05 19:39:43 +00001382 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001383 issue = self.GetIssue()
1384 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001385 if author:
1386 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001387 if issue:
1388 args.extend(['--issue', str(issue)])
1389 if patchset:
1390 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001391
Edward Lemur75526302020-02-27 22:31:05 +00001392 return args
1393
Josip Sokcevic017544d2022-03-31 23:47:53 +00001394 def RunHook(self,
1395 committing,
1396 may_prompt,
1397 verbose,
1398 parallel,
1399 upstream,
1400 description,
1401 all_files,
1402 files=None,
1403 resultdb=False,
1404 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001405 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1406 args = self._GetCommonPresubmitArgs(verbose, upstream)
1407 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001408 if may_prompt:
1409 args.append('--may_prompt')
1410 if parallel:
1411 args.append('--parallel')
1412 if all_files:
1413 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001414 if files:
1415 args.extend(files.split(';'))
1416 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001417 if files or all_files:
1418 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001419
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001420 if resultdb and not realm:
1421 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1422 # it is not required to pass the realm flag
1423 print('Note: ResultDB reporting will NOT be performed because --realm'
1424 ' was not specified. To enable ResultDB, please run the command'
1425 ' again with the --realm argument to specify the LUCI realm.')
1426
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001427 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1428 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001429 if py3_results.get('skipped_presubmits', 1) == 0:
1430 print('No more presubmits to run - skipping Python 2 presubmits.')
1431 return py3_results
1432
1433 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1434 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001435 return self._MergePresubmitResults(py2_results, py3_results)
1436
1437 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1438 args = args[:]
1439 vpython = 'vpython3' if use_python3 else 'vpython'
1440
Edward Lemur227d5102020-02-25 23:45:35 +00001441 with gclient_utils.temporary_file() as description_file:
1442 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001443 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001444 args.extend(['--json_output', json_output])
1445 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001446 if self.GetUsePython3():
1447 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001448 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001449 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001450 if resultdb and realm:
1451 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001452
1453 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001454 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001455
Edward Lemur227d5102020-02-25 23:45:35 +00001456 metrics.collector.add_repeated('sub_commands', {
1457 'command': 'presubmit',
1458 'execution_time': time_time() - start,
1459 'exit_code': exit_code,
1460 })
1461
1462 if exit_code:
1463 sys.exit(exit_code)
1464
1465 json_results = gclient_utils.FileRead(json_output)
1466 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001468 def _MergePresubmitResults(self, py2_results, py3_results):
1469 return {
1470 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1471 py3_results.get('more_cc', []))),
1472 'errors': (
1473 py2_results.get('errors', []) + py3_results.get('errors', [])),
1474 'notifications': (
1475 py2_results.get('notifications', []) +
1476 py3_results.get('notifications', [])),
1477 'warnings': (
1478 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1479 }
1480
Brian Sheedy7326ca22022-11-02 18:36:17 +00001481 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001482 args = self._GetCommonPresubmitArgs(verbose, upstream)
1483 args.append('--post_upload')
1484
1485 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001486 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001487 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001488 if not py3_only:
1489 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001490 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1491 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001492 if not py3_only:
1493 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001494 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001495
Edward Lemur5a644f82020-03-18 16:44:57 +00001496 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001497 # type: (optparse.Values, Sequence[str], Sequence[str]
1498 # ) -> ChangeDescription
1499 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001500 if self.GetIssue():
1501 description = self.FetchDescription()
1502 elif options.message:
1503 description = options.message
1504 else:
1505 description = _create_description_from_log(git_diff_args)
1506 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001507 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001508
Edward Lemur5a644f82020-03-18 16:44:57 +00001509 bug = options.bug
1510 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001511 if not self.GetIssue():
1512 # Extract bug number from branch name, but only if issue is being created.
1513 # It must start with bug or fix, followed by _ or - and number.
1514 # Optionally, it may contain _ or - after number with arbitrary text.
1515 # Examples:
1516 # bug-123
1517 # bug_123
1518 # fix-123
1519 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001520 branch = self.GetBranch()
1521 if branch is not None:
1522 match = re.match(
1523 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1524 if not bug and not fixed and match:
1525 if match.group('type') == 'bug':
1526 bug = match.group('bugnum')
1527 else:
1528 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001529
1530 change_description = ChangeDescription(description, bug, fixed)
1531
Joanna Wang39811b12023-01-20 23:09:48 +00001532 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001533 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001534 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001535 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001536 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001537 missing_files = [
1538 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001539 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001540 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001541 owners = self.owners_client.SuggestOwners(
1542 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001543 assert isinstance(options.reviewers, list), options.reviewers
1544 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001545
Edward Lemur5a644f82020-03-18 16:44:57 +00001546 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001547 if options.reviewers:
1548 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001549
1550 return change_description
1551
1552 def _GetTitleForUpload(self, options):
manukh566e9d02022-06-30 19:49:53 +00001553 # When not squashing or options.title is provided, just return
1554 # options.title.
1555 if not options.squash or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001556 return options.title
1557
1558 # On first upload, patchset title is always this string, while options.title
1559 # gets converted to first line of message.
1560 if not self.GetIssue():
1561 return 'Initial upload'
1562
1563 # When uploading subsequent patchsets, options.message is taken as the title
1564 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001565 if options.message:
1566 return options.message.strip()
1567
1568 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001569 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001570 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001571 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001572 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001573
1574 # Use the default title if the user confirms the default with a 'y'.
1575 if user_title.lower() == 'y':
1576 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001577 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001578
Joanna Wangb88a4342023-01-24 01:28:22 +00001579 def PrepareSquashedCommit(self, options, parent=None, end_commit=None):
1580 # type: (optparse.Values, Optional[str], Optional[str]) -> _NewUpload()
1581 """Create a squashed commit to upload."""
1582 if parent is None:
1583 origin, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch())
1584 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
1585 if origin == '.':
1586 # upstream is another local branch.
1587 # Assume we want to upload from upstream's last upload.
1588 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch,
1589 GERRIT_SQUASH_HASH_CONFIG_KEY)
1590 assert parent, ('upstream branch %s not configured correctly. '
1591 'Could not fetch latest gerrit upload from git '
1592 'config.')
1593 else:
1594 # upstream is the root of the tree.
1595 parent = self.GetCommonAncestorWithUpstream()
1596
1597 if end_commit is None:
1598 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1599
1600 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1601 end_commit)
1602 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1603 with gclient_utils.temporary_file() as desc_tempfile:
1604 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1605 commit_to_push = RunGit(
1606 ['commit-tree', latest_tree, '-p', parent, '-F',
1607 desc_tempfile]).strip()
1608
1609 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, change_desc)
1610
Joanna Wange8523912023-01-21 02:05:40 +00001611 def PrepareCherryPickSquashedCommit(self, options):
1612 # type: (optparse.Values) -> _NewUpload()
1613 """Create a commit cherry-picked on parent to push."""
1614
1615 parent = self.GetCommonAncestorWithUpstream()
1616 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1617 self.branchref)
1618
1619 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1620 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1621 with gclient_utils.temporary_file() as desc_tempfile:
1622 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1623 commit_to_cp = RunGit(
1624 ['commit-tree', latest_tree, '-p', parent, '-F',
1625 desc_tempfile]).strip()
1626
1627 _, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch())
1628
1629 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
1630 upstream_squashed_upload = scm.GIT.GetBranchConfig(
1631 settings.GetRoot(), upstream_branch, GERRIT_SQUASH_HASH_CONFIG_KEY)
1632
1633 RunGit(['checkout', '-q', upstream_squashed_upload])
1634 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1635 if ret:
1636 RunGit(['cherry-pick', '--abort'])
1637 RunGit(['checkout', '-q', self.branch])
1638 DieWithError('Could not cleanly cherry-pick')
1639
1640 commit_to_push = RunGit(['rev-parse', 'HEAD'])
1641 RunGit(['checkout', '-q', self.branch])
1642
1643 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
1644 change_desc)
1645
Joanna Wangb46232e2023-01-21 01:58:46 +00001646 def _PrepareChange(self, options, parent, end_commit):
1647 # type: (optparse.Values, str, str) ->
1648 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1649 """Prepares the change to be uploaded."""
1650 self.EnsureCanUploadPatchset(options.force)
1651
1652 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1653 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1654 files)
1655
1656 watchlist = watchlists.Watchlists(settings.GetRoot())
1657 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1658 if not options.bypass_hooks:
1659 hook_results = self.RunHook(committing=False,
1660 may_prompt=not options.force,
1661 verbose=options.verbose,
1662 parallel=options.parallel,
1663 upstream=parent,
1664 description=change_desc.description,
1665 all_files=False)
1666 self.ExtendCC(hook_results['more_cc'])
1667
1668 # Update the change description and ensure we have a Change Id.
1669 if self.GetIssue():
1670 if options.edit_description:
1671 change_desc.prompt()
1672 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1673 change_id = change_detail['change_id']
1674 change_desc.ensure_change_id(change_id)
1675
1676 # TODO(b/265929888): Pull in external changes for the current branch
1677 # only. No clear way to pull in external changes for upstream branches
1678 # yet. Potentially offer a separate command to pull in external changes.
1679 else: # No change issue. First time uploading
1680 if not options.force and not options.message_file:
1681 change_desc.prompt()
1682
1683 # Check if user added a change_id in the descripiton.
1684 change_ids = git_footers.get_footer_change_id(change_desc.description)
1685 if len(change_ids) == 1:
1686 change_id = change_ids[0]
1687 else:
1688 change_id = GenerateGerritChangeId(change_desc.description)
1689 change_desc.ensure_change_id(change_id)
1690
1691 if options.preserve_tryjobs:
1692 change_desc.set_preserve_tryjobs()
1693
1694 SaveDescriptionBackup(change_desc)
1695
1696 # Add ccs
1697 ccs = []
1698 # Add default, watchlist, presubmit ccs if this is an existing change
1699 # and CL is not private and auto-ccing has not been disabled.
1700 if self.GetIssue() and not (options.private and options.no_autocc):
1701 ccs = self.GetCCList().split(',')
1702 if len(ccs) > 100:
1703 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1704 'process/lsc/lsc_workflow.md')
1705 print('WARNING: This will auto-CC %s users.' % len(ccs))
1706 print('LSC may be more appropriate: %s' % lsc)
1707 print('You can also use the --no-autocc flag to disable auto-CC.')
1708 confirm_or_exit(action='continue')
1709
1710 # Add ccs from the --cc flag.
1711 if options.cc:
1712 ccs.extend(options.cc)
1713
1714 ccs = [email.strip() for email in ccs if email.strip()]
1715 if change_desc.get_cced():
1716 ccs.extend(change_desc.get_cced())
1717
1718 return change_desc.get_reviewers(), ccs, change_desc
1719
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001720 def CMDUpload(self, options, git_diff_args, orig_args):
1721 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001722 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001723 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001724 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001725 else:
1726 if self.GetBranch() is None:
1727 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1728
1729 # Default to diffing against common ancestor of upstream branch
1730 base_branch = self.GetCommonAncestorWithUpstream()
1731 git_diff_args = [base_branch, 'HEAD']
1732
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001733 # Fast best-effort checks to abort before running potentially expensive
1734 # hooks if uploading is likely to fail anyway. Passing these checks does
1735 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001736 self.EnsureAuthenticated(force=options.force)
1737 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001738
1739 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001740 watchlist = watchlists.Watchlists(settings.GetRoot())
1741 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001742 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001743 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001744
Edward Lemur5a644f82020-03-18 16:44:57 +00001745 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001746 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001747 hook_results = self.RunHook(
1748 committing=False,
1749 may_prompt=not options.force,
1750 verbose=options.verbose,
1751 parallel=options.parallel,
1752 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001753 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001754 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001755 resultdb=options.resultdb,
1756 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001757 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001758
Aaron Gable13101a62018-02-09 13:20:41 -08001759 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001760 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001761 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001762 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001763 if self.GetBranch() is not None:
1764 self._GitSetBranchConfigValue(
1765 LAST_UPLOAD_HASH_CONFIG_KEY,
1766 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001767 # Run post upload hooks, if specified.
1768 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001769 self.RunPostUploadHook(options.verbose, base_branch,
1770 change_desc.description,
1771 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001772
1773 # Upload all dependencies if specified.
1774 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001775 print()
1776 print('--dependencies has been specified.')
1777 print('All dependent local branches will be re-uploaded.')
1778 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001779 # Remove the dependencies flag from args so that we do not end up in a
1780 # loop.
1781 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001782 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001783 return ret
1784
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001785 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001786 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001787
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001788 Issue must have been already uploaded and known. Optionally allows for
1789 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001790 """
1791 assert new_state in _CQState.ALL_STATES
1792 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001793 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001794 vote_map = {
1795 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001796 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001797 _CQState.DRY_RUN: 1,
1798 _CQState.COMMIT: 2,
1799 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001800 if new_state == _CQState.QUICK_RUN:
1801 labels = {
1802 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1803 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1804 }
1805 else:
1806 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001807 notify = False if new_state == _CQState.DRY_RUN else None
1808 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001809 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001810 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001811 return 0
1812 except KeyboardInterrupt:
1813 raise
1814 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001815 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001816 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001817 ' * Your project has no CQ,\n'
1818 ' * You don\'t have permission to change the CQ state,\n'
1819 ' * There\'s a bug in this code (see stack trace below).\n'
1820 'Consider specifying which bots to trigger manually or asking your '
1821 'project owners for permissions or contacting Chrome Infra at:\n'
1822 'https://www.chromium.org/infra\n\n' %
1823 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001824 # Still raise exception so that stack trace is printed.
1825 raise
1826
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001827 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001828 # Lazy load of configs.
1829 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001830 if self._gerrit_host and '.' not in self._gerrit_host:
1831 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1832 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001833 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001834 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001835 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001836 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001837 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1838 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839 return self._gerrit_host
1840
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001841 def _GetGitHost(self):
1842 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001843 remote_url = self.GetRemoteUrl()
1844 if not remote_url:
1845 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001846 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001847
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001848 def GetCodereviewServer(self):
1849 if not self._gerrit_server:
1850 # If we're on a branch then get the server potentially associated
1851 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001852 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001853 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001854 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001855 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001856 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001857 if not self._gerrit_server:
1858 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1859 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001860 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001861 parts[0] = parts[0] + '-review'
1862 self._gerrit_host = '.'.join(parts)
1863 self._gerrit_server = 'https://%s' % self._gerrit_host
1864 return self._gerrit_server
1865
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001866 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001867 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001868 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001869 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001870 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001871 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001872 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001873 if project.endswith('.git'):
1874 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001875 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1876 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1877 # gitiles/git-over-https protocol. E.g.,
1878 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1879 # as
1880 # https://chromium.googlesource.com/v8/v8
1881 if project.startswith('a/'):
1882 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001883 return project
1884
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001885 def _GerritChangeIdentifier(self):
1886 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1887
1888 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001889 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001890 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001891 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001892 if project:
1893 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1894 # Fall back on still unique, but less efficient change number.
1895 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001896
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001897 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001898 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001899 if settings.GetGerritSkipEnsureAuthenticated():
1900 # For projects with unusual authentication schemes.
1901 # See http://crbug.com/603378.
1902 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001903
1904 # Check presence of cookies only if using cookies-based auth method.
1905 cookie_auth = gerrit_util.Authenticator.get()
1906 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001907 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001908
Florian Mayerae510e82020-01-30 21:04:48 +00001909 remote_url = self.GetRemoteUrl()
1910 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001911 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001912 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001913 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1914 logging.warning(
1915 'Ignoring branch %(branch)s with non-https/sso remote '
1916 '%(remote)s', {
1917 'branch': self.branch,
1918 'remote': self.GetRemoteUrl()
1919 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001920 return
1921
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001922 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001923 self.GetCodereviewServer()
1924 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001925 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001926
1927 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1928 git_auth = cookie_auth.get_auth_header(git_host)
1929 if gerrit_auth and git_auth:
1930 if gerrit_auth == git_auth:
1931 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001932 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001933 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001934 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001935 ' %s\n'
1936 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001937 ' Consider running the following command:\n'
1938 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001939 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001940 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001941 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001942 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001943 cookie_auth.get_new_password_message(git_host)))
1944 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001945 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001946 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001947
1948 missing = (
1949 ([] if gerrit_auth else [self._gerrit_host]) +
1950 ([] if git_auth else [git_host]))
1951 DieWithError('Credentials for the following hosts are required:\n'
1952 ' %s\n'
1953 'These are read from %s (or legacy %s)\n'
1954 '%s' % (
1955 '\n '.join(missing),
1956 cookie_auth.get_gitcookies_path(),
1957 cookie_auth.get_netrc_path(),
1958 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001959
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001960 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001961 if not self.GetIssue():
1962 return
1963
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001964 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001965 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001966 DieWithError(
1967 'Change %s has been abandoned, new uploads are not allowed' %
1968 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001969 if status == 'MERGED':
1970 answer = gclient_utils.AskForData(
1971 'Change %s has been submitted, new uploads are not allowed. '
1972 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1973 ).lower()
1974 if answer not in ('y', ''):
1975 DieWithError('New uploads are not allowed.')
1976 self.SetIssue()
1977 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001978
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001979 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1980 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1981 # Apparently this check is not very important? Otherwise get_auth_email
1982 # could have been added to other implementations of Authenticator.
1983 cookies_auth = gerrit_util.Authenticator.get()
1984 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001985 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001986
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001987 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001988 if self.GetIssueOwner() == cookies_user:
1989 return
1990 logging.debug('change %s owner is %s, cookies user is %s',
1991 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001992 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001993 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001994 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001995 if details['email'] == self.GetIssueOwner():
1996 return
1997 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001998 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001999 'as %s.\n'
2000 'Uploading may fail due to lack of permissions.' %
2001 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2002 confirm_or_exit(action='upload')
2003
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002004 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002005 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002006 or CQ status, assuming adherence to a common workflow.
2007
2008 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002009 * 'error' - error from review tool (including deleted issues)
2010 * 'unsent' - no reviewers added
2011 * 'waiting' - waiting for review
2012 * 'reply' - waiting for uploader to reply to review
2013 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002014 * 'dry-run' - dry-running in the CQ
2015 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002016 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002017 """
2018 if not self.GetIssue():
2019 return None
2020
2021 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002022 data = self._GetChangeDetail([
2023 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002024 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002025 return 'error'
2026
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002027 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002028 return 'closed'
2029
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002030 cq_label = data['labels'].get('Commit-Queue', {})
2031 max_cq_vote = 0
2032 for vote in cq_label.get('all', []):
2033 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2034 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002035 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002036 if max_cq_vote == 1:
2037 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002038
Aaron Gable9ab38c62017-04-06 14:36:33 -07002039 if data['labels'].get('Code-Review', {}).get('approved'):
2040 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002041
2042 if not data.get('reviewers', {}).get('REVIEWER', []):
2043 return 'unsent'
2044
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002045 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002046 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002047 while messages:
2048 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002049 if (m.get('tag', '').startswith('autogenerated:cq') or
2050 m.get('tag', '').startswith('autogenerated:cv')):
2051 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002052 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002053 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002054 # Most recent message was by owner.
2055 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002056
2057 # Some reply from non-owner.
2058 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002059
2060 # Somehow there are no messages even though there are reviewers.
2061 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002062
Gavin Mak4e5e3992022-11-14 22:40:12 +00002063 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002064 if not self.GetIssue():
2065 return None
2066
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002067 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002068 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002069 if update:
2070 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002071 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002072
Gavin Makf35a9eb2022-11-17 18:34:36 +00002073 def _IsPatchsetRangeSignificant(self, lower, upper):
2074 """Returns True if the inclusive range of patchsets contains any reworks or
2075 rebases."""
2076 if not self.GetIssue():
2077 return False
2078
2079 data = self._GetChangeDetail(['ALL_REVISIONS'])
2080 ps_kind = {}
2081 for rev_info in data.get('revisions', {}).values():
2082 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2083
2084 for ps in range(lower, upper + 1):
2085 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2086 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2087 return True
2088 return False
2089
Gavin Make61ccc52020-11-13 00:12:57 +00002090 def GetMostRecentDryRunPatchset(self):
2091 """Get patchsets equivalent to the most recent patchset and return
2092 the patchset with the latest dry run. If none have been dry run, return
2093 the latest patchset."""
2094 if not self.GetIssue():
2095 return None
2096
2097 data = self._GetChangeDetail(['ALL_REVISIONS'])
2098 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002099 dry_run = {int(m['_revision_number'])
2100 for m in data.get('messages', [])
2101 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002102
2103 for revision_info in sorted(data.get('revisions', {}).values(),
2104 key=lambda c: c['_number'], reverse=True):
2105 if revision_info['_number'] in dry_run:
2106 patchset = revision_info['_number']
2107 break
2108 if revision_info.get('kind', '') not in \
2109 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2110 break
2111 self.SetPatchset(patchset)
2112 return patchset
2113
Aaron Gable636b13f2017-07-14 10:42:48 -07002114 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002115 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002116 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002117 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002118
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002119 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002120 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002121 # CURRENT_REVISION is included to get the latest patchset so that
2122 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002123 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002124 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2125 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002126 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002127 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002128 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002129 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002130
2131 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002132 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002133 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002134 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002135 line_comments = file_comments.setdefault(path, [])
2136 line_comments.extend(
2137 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002138
2139 # Build dictionary of file comments for easy access and sorting later.
2140 # {author+date: {path: {patchset: {line: url+message}}}}
2141 comments = collections.defaultdict(
2142 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002143
2144 server = self.GetCodereviewServer()
2145 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2146 # /c/ is automatically added by short URL server.
2147 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2148 self.GetIssue())
2149 else:
2150 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2151
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002152 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002153 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002154 tag = comment.get('tag', '')
2155 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002156 continue
2157 key = (comment['author']['email'], comment['updated'])
2158 if comment.get('side', 'REVISION') == 'PARENT':
2159 patchset = 'Base'
2160 else:
2161 patchset = 'PS%d' % comment['patch_set']
2162 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002163 url = ('%s/%s/%s#%s%s' %
2164 (url_prefix, comment['patch_set'], path,
2165 'b' if comment.get('side') == 'PARENT' else '',
2166 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002167 comments[key][path][patchset][line] = (url, comment['message'])
2168
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002169 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002170 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002171 summary = self._BuildCommentSummary(msg, comments, readable)
2172 if summary:
2173 summaries.append(summary)
2174 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002175
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002176 @staticmethod
2177 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002178 if 'email' not in msg['author']:
2179 # Some bot accounts may not have an email associated.
2180 return None
2181
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002182 key = (msg['author']['email'], msg['date'])
2183 # Don't bother showing autogenerated messages that don't have associated
2184 # file or line comments. this will filter out most autogenerated
2185 # messages, but will keep robot comments like those from Tricium.
2186 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2187 if is_autogenerated and not comments.get(key):
2188 return None
2189 message = msg['message']
2190 # Gerrit spits out nanoseconds.
2191 assert len(msg['date'].split('.')[-1]) == 9
2192 date = datetime.datetime.strptime(msg['date'][:-3],
2193 '%Y-%m-%d %H:%M:%S.%f')
2194 if key in comments:
2195 message += '\n'
2196 for path, patchsets in sorted(comments.get(key, {}).items()):
2197 if readable:
2198 message += '\n%s' % path
2199 for patchset, lines in sorted(patchsets.items()):
2200 for line, (url, content) in sorted(lines.items()):
2201 if line:
2202 line_str = 'Line %d' % line
2203 path_str = '%s:%d:' % (path, line)
2204 else:
2205 line_str = 'File comment'
2206 path_str = '%s:0:' % path
2207 if readable:
2208 message += '\n %s, %s: %s' % (patchset, line_str, url)
2209 message += '\n %s\n' % content
2210 else:
2211 message += '\n%s ' % path_str
2212 message += '\n%s\n' % content
2213
2214 return _CommentSummary(
2215 date=date,
2216 message=message,
2217 sender=msg['author']['email'],
2218 autogenerated=is_autogenerated,
2219 # These could be inferred from the text messages and correlated with
2220 # Code-Review label maximum, however this is not reliable.
2221 # Leaving as is until the need arises.
2222 approval=False,
2223 disapproval=False,
2224 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002225
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002226 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002227 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002228 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002229
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002230 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002231 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002232 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002233
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002234 def _GetChangeDetail(self, options=None):
2235 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002236 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002237 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002238
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002239 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002240 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002241 options.append('CURRENT_COMMIT')
2242
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002243 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002244 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002245 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002246
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002247 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2248 # Assumption: data fetched before with extra options is suitable
2249 # for return for a smaller set of options.
2250 # For example, if we cached data for
2251 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2252 # and request is for options=[CURRENT_REVISION],
2253 # THEN we can return prior cached data.
2254 if options_set.issubset(cached_options_set):
2255 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002256
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002257 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002258 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002259 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002260 except gerrit_util.GerritError as e:
2261 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002262 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002263 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002264
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002265 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002266 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002267
Gavin Mak4e5e3992022-11-14 22:40:12 +00002268 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002269 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002270 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002271 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2272 self._GerritChangeIdentifier(),
2273 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002274 except gerrit_util.GerritError as e:
2275 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002276 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002277 raise
agable32978d92016-11-01 12:55:02 -07002278 return data
2279
Karen Qian40c19422019-03-13 21:28:29 +00002280 def _IsCqConfigured(self):
2281 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002282 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002283
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002284 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002285 if git_common.is_dirty_git_tree('land'):
2286 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002287
tandriid60367b2016-06-22 05:25:12 -07002288 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002289 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002290 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002291 'which can test and land changes for you. '
2292 'Are you sure you wish to bypass it?\n',
2293 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002294 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002295 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002296 # Note: git diff outputs nothing if there is no diff.
2297 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002298 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002299 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002300 if detail['current_revision'] == last_upload:
2301 differs = False
2302 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002303 print('WARNING: Local branch contents differ from latest uploaded '
2304 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002305 if differs:
2306 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002307 confirm_or_exit(
2308 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2309 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002310 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002311 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002312 upstream = self.GetCommonAncestorWithUpstream()
2313 if self.GetIssue():
2314 description = self.FetchDescription()
2315 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002316 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002317 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002318 committing=True,
2319 may_prompt=not force,
2320 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002321 parallel=parallel,
2322 upstream=upstream,
2323 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002324 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002325 resultdb=resultdb,
2326 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002327
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002328 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002329 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002330 links = self._GetChangeCommit().get('web_links', [])
2331 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002332 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002333 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002334 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002335 return 0
2336
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002337 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2338 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002339 assert parsed_issue_arg.valid
2340
Edward Lemur125d60a2019-09-13 18:25:41 +00002341 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002342
2343 if parsed_issue_arg.hostname:
2344 self._gerrit_host = parsed_issue_arg.hostname
2345 self._gerrit_server = 'https://%s' % self._gerrit_host
2346
tandriic2405f52016-10-10 08:13:15 -07002347 try:
2348 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002349 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002350 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002351
2352 if not parsed_issue_arg.patchset:
2353 # Use current revision by default.
2354 revision_info = detail['revisions'][detail['current_revision']]
2355 patchset = int(revision_info['_number'])
2356 else:
2357 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002358 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002359 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2360 break
2361 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002362 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002363 (parsed_issue_arg.patchset, self.GetIssue()))
2364
Edward Lemur125d60a2019-09-13 18:25:41 +00002365 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002366 if remote_url.endswith('.git'):
2367 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002368 remote_url = remote_url.rstrip('/')
2369
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002370 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002371 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002372
2373 if remote_url != fetch_info['url']:
2374 DieWithError('Trying to patch a change from %s but this repo appears '
2375 'to be %s.' % (fetch_info['url'], remote_url))
2376
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002377 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002378
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002379 # If we have created a new branch then do the "set issue" immediately in
2380 # case the cherry-pick fails, which happens when resolving conflicts.
2381 if newbranch:
2382 self.SetIssue(parsed_issue_arg.issue)
2383
Aaron Gable62619a32017-06-16 08:22:09 -07002384 if force:
2385 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2386 print('Checked out commit for change %i patchset %i locally' %
2387 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002388 elif nocommit:
2389 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2390 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002391 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002392 RunGit(['cherry-pick', 'FETCH_HEAD'])
2393 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002394 (parsed_issue_arg.issue, patchset))
2395 print('Note: this created a local commit which does not have '
2396 'the same hash as the one uploaded for review. This will make '
2397 'uploading changes based on top of this branch difficult.\n'
2398 'If you want to do that, use "git cl patch --force" instead.')
2399
Stefan Zagerd08043c2017-10-12 12:07:02 -07002400 if self.GetBranch():
2401 self.SetIssue(parsed_issue_arg.issue)
2402 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002403 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002404 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2405 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002406 else:
2407 print('WARNING: You are in detached HEAD state.\n'
2408 'The patch has been applied to your checkout, but you will not be '
2409 'able to upload a new patch set to the gerrit issue.\n'
2410 'Try using the \'-b\' option if you would like to work on a '
2411 'branch and/or upload a new patch set.')
2412
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002413 return 0
2414
Joanna Wang18de1f62023-01-21 01:24:24 +00002415 @staticmethod
2416 def _GerritCommitMsgHookCheck(offer_removal):
2417 # type: (bool) -> None
2418 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002419 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2420 if not os.path.exists(hook):
2421 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002422 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2423 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002424 data = gclient_utils.FileRead(hook)
2425 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2426 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002427 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002428 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002429 'and may interfere with it in subtle ways.\n'
2430 'We recommend you remove the commit-msg hook.')
2431 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002432 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002433 gclient_utils.rm_file_or_tree(hook)
2434 print('Gerrit commit-msg hook removed.')
2435 else:
2436 print('OK, will keep Gerrit commit-msg hook in place.')
2437
Edward Lemur1b52d872019-05-09 21:12:12 +00002438 def _CleanUpOldTraces(self):
2439 """Keep only the last |MAX_TRACES| traces."""
2440 try:
2441 traces = sorted([
2442 os.path.join(TRACES_DIR, f)
2443 for f in os.listdir(TRACES_DIR)
2444 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2445 and not f.startswith('tmp'))
2446 ])
2447 traces_to_delete = traces[:-MAX_TRACES]
2448 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002449 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002450 except OSError:
2451 print('WARNING: Failed to remove old git traces from\n'
2452 ' %s'
2453 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002454
Edward Lemur5737f022019-05-17 01:24:00 +00002455 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002456 """Zip and write the git push traces stored in traces_dir."""
2457 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002458 traces_zip = trace_name + '-traces'
2459 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002460 # Create a temporary dir to store git config and gitcookies in. It will be
2461 # compressed and stored next to the traces.
2462 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002463 git_info_zip = trace_name + '-git-info'
2464
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002465 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002466
Edward Lemur1b52d872019-05-09 21:12:12 +00002467 git_push_metadata['trace_name'] = trace_name
2468 gclient_utils.FileWrite(
2469 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2470
2471 # Keep only the first 6 characters of the git hashes on the packet
2472 # trace. This greatly decreases size after compression.
2473 packet_traces = os.path.join(traces_dir, 'trace-packet')
2474 if os.path.isfile(packet_traces):
2475 contents = gclient_utils.FileRead(packet_traces)
2476 gclient_utils.FileWrite(
2477 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2478 shutil.make_archive(traces_zip, 'zip', traces_dir)
2479
2480 # Collect and compress the git config and gitcookies.
2481 git_config = RunGit(['config', '-l'])
2482 gclient_utils.FileWrite(
2483 os.path.join(git_info_dir, 'git-config'),
2484 git_config)
2485
2486 cookie_auth = gerrit_util.Authenticator.get()
2487 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2488 gitcookies_path = cookie_auth.get_gitcookies_path()
2489 if os.path.isfile(gitcookies_path):
2490 gitcookies = gclient_utils.FileRead(gitcookies_path)
2491 gclient_utils.FileWrite(
2492 os.path.join(git_info_dir, 'gitcookies'),
2493 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2494 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2495
Edward Lemur1b52d872019-05-09 21:12:12 +00002496 gclient_utils.rmtree(git_info_dir)
2497
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002498 def _RunGitPushWithTraces(self,
2499 refspec,
2500 refspec_opts,
2501 git_push_metadata,
2502 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002503 """Run git push and collect the traces resulting from the execution."""
2504 # Create a temporary directory to store traces in. Traces will be compressed
2505 # and stored in a 'traces' dir inside depot_tools.
2506 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002507 trace_name = os.path.join(
2508 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002509
2510 env = os.environ.copy()
2511 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2512 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002513 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002514 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2515 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2516 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2517
2518 try:
2519 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002520 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002521 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002522 push_cmd = ['git', 'push', remote_url, refspec]
2523 if git_push_options:
2524 for opt in git_push_options:
2525 push_cmd.extend(['-o', opt])
2526
Edward Lemur0f58ae42019-04-30 17:24:12 +00002527 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002528 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002529 env=env,
2530 print_stdout=True,
2531 # Flush after every line: useful for seeing progress when running as
2532 # recipe.
2533 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002534 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002535 except subprocess2.CalledProcessError as e:
2536 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002537 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002538 raise GitPushError(
2539 'Failed to create a change, very likely due to blocked keyword. '
2540 'Please examine output above for the reason of the failure.\n'
2541 'If this is a false positive, you can try to bypass blocked '
2542 'keyword by using push option '
2543 '-o uploadvalidator~skip, e.g.:\n'
2544 'git cl upload -o uploadvalidator~skip\n\n'
2545 'If git-cl is not working correctly, file a bug under the '
2546 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002547 if 'git push -o nokeycheck' in str(e.stdout):
2548 raise GitPushError(
2549 'Failed to create a change, very likely due to a private key being '
2550 'detected. Please examine output above for the reason of the '
2551 'failure.\n'
2552 'If this is a false positive, you can try to bypass private key '
2553 'detection by using push option '
2554 '-o nokeycheck, e.g.:\n'
2555 'git cl upload -o nokeycheck\n\n'
2556 'If git-cl is not working correctly, file a bug under the '
2557 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002558
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002559 raise GitPushError(
2560 'Failed to create a change. Please examine output above for the '
2561 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002562 'For emergencies, Googlers can escalate to '
2563 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002564 'Hint: run command below to diagnose common Git/Gerrit '
2565 'credential problems:\n'
2566 ' git cl creds-check\n'
2567 '\n'
2568 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2569 'component including the files below.\n'
2570 'Review the files before upload, since they might contain sensitive '
2571 'information.\n'
2572 'Set the Restrict-View-Google label so that they are not publicly '
2573 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002574 finally:
2575 execution_time = time_time() - before_push
2576 metrics.collector.add_repeated('sub_commands', {
2577 'command': 'git push',
2578 'execution_time': execution_time,
2579 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002580 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002581 })
2582
Edward Lemur1b52d872019-05-09 21:12:12 +00002583 git_push_metadata['execution_time'] = execution_time
2584 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002585 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002586
Edward Lemur1b52d872019-05-09 21:12:12 +00002587 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002588 gclient_utils.rmtree(traces_dir)
2589
2590 return push_stdout
2591
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002592 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2593 change_desc):
2594 """Upload the current branch to Gerrit, retry if new remote HEAD is
2595 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002596 remote, remote_branch = self.GetRemoteBranch()
2597 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2598
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002599 try:
2600 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002601 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002602 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002603 # Repository might be in the middle of transition to main branch as
2604 # default, and uploads to old default might be blocked.
2605 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002606 DieWithError(str(e), change_desc)
2607
Josip Sokcevicb631a882021-01-06 18:18:10 +00002608 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2609 self.GetGerritProject())
2610 if project_head == branch:
2611 DieWithError(str(e), change_desc)
2612 branch = project_head
2613
2614 print("WARNING: Fetching remote state and retrying upload to default "
2615 "branch...")
2616 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002617 options.edit_description = False
2618 options.force = True
2619 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002620 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2621 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002622 except GitPushError as e:
2623 DieWithError(str(e), change_desc)
2624
2625 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002626 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002628 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002629 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002630 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002631 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002632 # User requested to change description
2633 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002634 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002635 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2636 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002637 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002638
2639 # Check if changes outside of this workspace have been uploaded.
2640 current_rev = change_detail['current_revision']
2641 last_uploaded_rev = self._GitGetBranchConfigValue(
2642 GERRIT_SQUASH_HASH_CONFIG_KEY)
2643 if last_uploaded_rev and current_rev != last_uploaded_rev:
2644 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002645 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002646 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002647 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002648 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002649 if len(change_ids) == 1:
2650 change_id = change_ids[0]
2651 else:
2652 change_id = GenerateGerritChangeId(change_desc.description)
2653 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002654
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002655 if options.preserve_tryjobs:
2656 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002657
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002658 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002659 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002660 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002661 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002662 with gclient_utils.temporary_file() as desc_tempfile:
2663 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2664 ref_to_push = RunGit(
2665 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002666 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002667 if options.no_add_changeid:
2668 pass
2669 else: # adding Change-Ids is okay.
2670 if not git_footers.get_footer_change_id(change_desc.description):
2671 DownloadGerritHook(False)
2672 change_desc.set_description(
2673 self._AddChangeIdToCommitMessage(change_desc.description,
2674 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002675 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002676 # For no-squash mode, we assume the remote called "origin" is the one we
2677 # want. It is not worthwhile to support different workflows for
2678 # no-squash mode.
2679 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002680 # attempt to extract the changeid from the current description
2681 # fail informatively if not possible.
2682 change_id_candidates = git_footers.get_footer_change_id(
2683 change_desc.description)
2684 if not change_id_candidates:
2685 DieWithError("Unable to extract change-id from message.")
2686 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002687
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002688 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002689 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2690 ref_to_push)]).splitlines()
2691 if len(commits) > 1:
2692 print('WARNING: This will upload %d commits. Run the following command '
2693 'to see which commits will be uploaded: ' % len(commits))
2694 print('git log %s..%s' % (parent, ref_to_push))
2695 print('You can also use `git squash-branch` to squash these into a '
2696 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002697 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002698
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002699 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002700 cc = []
Joanna Wangc8f23e22023-01-19 21:18:10 +00002701 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002702 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2703 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002704 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002705 if len(cc) > 100:
2706 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2707 'process/lsc/lsc_workflow.md')
2708 print('WARNING: This will auto-CC %s users.' % len(cc))
2709 print('LSC may be more appropriate: %s' % lsc)
2710 print('You can also use the --no-autocc flag to disable auto-CC.')
2711 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002712 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002713 if options.cc:
2714 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002715 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002716 if change_desc.get_cced():
2717 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002718 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002719 valid_accounts = set(reviewers + cc)
2720 # TODO(crbug/877717): relax this for all hosts.
2721 else:
2722 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002723 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002724 logging.info('accounts %s are recognized, %s invalid',
2725 sorted(valid_accounts),
2726 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002727
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002728 # Extra options that can be specified at push time. Doc:
2729 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002730 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002731
Aaron Gable844cf292017-06-28 11:32:59 -07002732 # By default, new changes are started in WIP mode, and subsequent patchsets
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002733 # don't send email. At any time, passing --send-mail or --send-email will
2734 # mark the change ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002735 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002736 refspec_opts.append('ready')
2737 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002738 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002739 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002740 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002741 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002742
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002743 # TODO(tandrii): options.message should be posted as a comment if
2744 # --send-mail or --send-email is set on non-initial upload as Rietveld used
2745 # to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002746
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002747 # Set options.title in case user was prompted in _GetTitleForUpload and
2748 # _CMDUploadChange needs to be called again.
2749 options.title = self._GetTitleForUpload(options)
2750 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002751 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002752 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002753 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002754
agablec6787972016-09-09 16:13:34 -07002755 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002756 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002757
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002758 for r in sorted(reviewers):
2759 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002760 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002761 reviewers.remove(r)
2762 else:
2763 # TODO(tandrii): this should probably be a hard failure.
2764 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2765 % r)
2766 for c in sorted(cc):
2767 # refspec option will be rejected if cc doesn't correspond to an
2768 # account, even though REST call to add such arbitrary cc may succeed.
2769 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002770 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002771 cc.remove(c)
2772
rmistry9eadede2016-09-19 11:22:43 -07002773 if options.topic:
2774 # Documentation on Gerrit topics is here:
2775 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002776 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002777
Edward Lemur687ca902018-12-05 02:30:30 +00002778 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002779 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002780 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002781 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002782 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002783 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002784 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002785 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002786 elif options.cq_quick_run:
2787 refspec_opts.append('l=Commit-Queue+1')
2788 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002789
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002790 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002791 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002792 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002793 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002794 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2795
2796 refspec_suffix = ''
2797 if refspec_opts:
2798 refspec_suffix = '%' + ','.join(refspec_opts)
2799 assert ' ' not in refspec_suffix, (
2800 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2801 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002802
Edward Lemur1b52d872019-05-09 21:12:12 +00002803 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002804 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002805 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002806 'change_id': change_id,
2807 'description': change_desc.description,
2808 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002809
Gavin Mak4e5e3992022-11-14 22:40:12 +00002810 # Gerrit may or may not update fast enough to return the correct patchset
2811 # number after we push. Get the pre-upload patchset and increment later.
2812 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2813
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002814 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002815 git_push_metadata,
2816 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817
2818 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002819 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002820 change_numbers = [m.group(1)
2821 for m in map(regex.match, push_stdout.splitlines())
2822 if m]
2823 if len(change_numbers) != 1:
2824 DieWithError(
2825 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002826 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002827 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002828 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002829 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002830
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002831 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002832 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002833 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002834 gerrit_util.AddReviewers(self.GetGerritHost(),
2835 self._GerritChangeIdentifier(),
2836 reviewers,
2837 cc,
2838 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002839
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002840 return 0
2841
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002842 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2843 change_desc):
2844 """Computes parent of the generated commit to be uploaded to Gerrit.
2845
2846 Returns revision or a ref name.
2847 """
2848 if custom_cl_base:
2849 # Try to avoid creating additional unintended CLs when uploading, unless
2850 # user wants to take this risk.
2851 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2852 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2853 local_ref_of_target_remote])
2854 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002855 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002856 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2857 'If you proceed with upload, more than 1 CL may be created by '
2858 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2859 'If you are certain that specified base `%s` has already been '
2860 'uploaded to Gerrit as another CL, you may proceed.\n' %
2861 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2862 if not force:
2863 confirm_or_exit(
2864 'Do you take responsibility for cleaning up potential mess '
2865 'resulting from proceeding with upload?',
2866 action='upload')
2867 return custom_cl_base
2868
Aaron Gablef97e33d2017-03-30 15:44:27 -07002869 if remote != '.':
2870 return self.GetCommonAncestorWithUpstream()
2871
2872 # If our upstream branch is local, we base our squashed commit on its
2873 # squashed version.
2874 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2875
Aaron Gablef97e33d2017-03-30 15:44:27 -07002876 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002877 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002878 if upstream_branch_name == 'main':
2879 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002880
2881 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002882 # TODO(tandrii): consider checking parent change in Gerrit and using its
2883 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2884 # the tree hash of the parent branch. The upside is less likely bogus
2885 # requests to reupload parent change just because it's uploadhash is
2886 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002887 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2888 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002889 # Verify that the upstream branch has been uploaded too, otherwise
2890 # Gerrit will create additional CLs when uploading.
2891 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2892 RunGitSilent(['rev-parse', parent + ':'])):
2893 DieWithError(
2894 '\nUpload upstream branch %s first.\n'
2895 'It is likely that this branch has been rebased since its last '
2896 'upload, so you just need to upload it again.\n'
2897 '(If you uploaded it with --no-squash, then branch dependencies '
2898 'are not supported, and you should reupload with --squash.)'
2899 % upstream_branch_name,
2900 change_desc)
2901 return parent
2902
Gavin Mak4e5e3992022-11-14 22:40:12 +00002903 def _UpdateWithExternalChanges(self):
2904 """Updates workspace with external changes.
2905
2906 Returns the commit hash that should be used as the merge base on upload.
2907 """
2908 local_ps = self.GetPatchset()
2909 if local_ps is None:
2910 return
2911
2912 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002913 if external_ps is None or local_ps == external_ps or \
2914 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002915 return
2916
2917 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002918 if num_changes > 1:
2919 change_words = 'changes were'
2920 else:
2921 change_words = 'change was'
2922 print('\n%d external %s published to %s:\n' %
2923 (num_changes, change_words, self.GetIssueURL(short=True)))
2924
2925 # Print an overview of external changes.
2926 ps_to_commit = {}
2927 ps_to_info = {}
2928 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2929 for commit_id, revision_info in revisions.get('revisions', {}).items():
2930 ps_num = revision_info['_number']
2931 ps_to_commit[ps_num] = commit_id
2932 ps_to_info[ps_num] = revision_info
2933
2934 for ps in range(external_ps, local_ps, -1):
2935 commit = ps_to_commit[ps][:8]
2936 desc = ps_to_info[ps].get('description', '')
2937 print('Patchset %d [%s] %s' % (ps, commit, desc))
2938
2939 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2940 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002941 return
2942
2943 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2944 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2945 external_base = external_parent['commit']
2946
2947 branch = git_common.current_branch()
2948 local_base = self.GetCommonAncestorWithUpstream()
2949 if local_base != external_base:
2950 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2951 (local_base, external_base))
2952 if git_common.upstream(branch):
2953 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2954 'to make these the same.')
2955 print('No upstream branch set. Consider setting it and using '
2956 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2957
2958 # Fetch Gerrit's CL base if it doesn't exist locally.
2959 remote, _ = self.GetRemoteBranch()
2960 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2961 RunGitSilent(['fetch', remote, external_base])
2962
2963 # Get the diff between local_ps and external_ps.
2964 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002965 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002966 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
2967 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2968 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
2969 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2970 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
2971
2972 # Diff can be empty in the case of trivial rebases.
2973 if not diff:
2974 return external_base
2975
2976 # Apply the diff.
2977 with gclient_utils.temporary_file() as diff_tempfile:
2978 gclient_utils.FileWrite(diff_tempfile, diff)
2979 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
2980 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
2981 if not clean_patch:
2982 # Normally patchset is set after upload. But because we exit, that never
2983 # happens. Updating here makes sure that subsequent uploads don't need
2984 # to fetch/apply the same diff again.
2985 self.SetPatchset(external_ps)
2986 DieWithError('\nPatch did not apply cleanly. Please resolve any '
2987 'conflicts and reupload.')
2988
2989 message = 'Incorporate external changes from '
2990 if num_changes == 1:
2991 message += 'patchset %d' % external_ps
2992 else:
2993 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
2994 RunGitSilent(['commit', '-am', message])
2995 # TODO(crbug.com/1382528): Use the previous commit's message as a default
2996 # patchset title instead of this 'Incorporate' message.
2997 return external_base
2998
Edward Lemura12175c2020-03-09 16:58:26 +00002999 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003000 """Re-commits using the current message, assumes the commit hook is in
3001 place.
3002 """
Edward Lemura12175c2020-03-09 16:58:26 +00003003 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003004 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003005 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003006 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003007 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003008
3009 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003010
tandriie113dfd2016-10-11 10:20:12 -07003011 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003012 try:
3013 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003014 except GerritChangeNotExists:
3015 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003016
3017 if data['status'] in ('ABANDONED', 'MERGED'):
3018 return 'CL %s is closed' % self.GetIssue()
3019
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003020 def GetGerritChange(self, patchset=None):
3021 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003022 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003023 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003024 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003025 data = self._GetChangeDetail(['ALL_REVISIONS'])
3026
3027 assert host and issue and patchset, 'CL must be uploaded first'
3028
3029 has_patchset = any(
3030 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003031 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003032 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003033 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003034 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003035
tandrii8c5a3532016-11-04 07:52:02 -07003036 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003037 'host': host,
3038 'change': issue,
3039 'project': data['project'],
3040 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003041 }
tandriie113dfd2016-10-11 10:20:12 -07003042
tandriide281ae2016-10-12 06:02:30 -07003043 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003044 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003045
Edward Lemur707d70b2018-02-07 00:50:14 +01003046 def GetReviewers(self):
3047 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003048 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003049
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003050
Lei Zhang8a0efc12020-08-05 19:58:45 +00003051def _get_bug_line_values(default_project_prefix, bugs):
3052 """Given default_project_prefix and comma separated list of bugs, yields bug
3053 line values.
tandriif9aefb72016-07-01 09:06:51 -07003054
3055 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003056 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003057 * string, which is left as is.
3058
3059 This function may produce more than one line, because bugdroid expects one
3060 project per line.
3061
Lei Zhang8a0efc12020-08-05 19:58:45 +00003062 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003063 ['v8:123', 'chromium:789']
3064 """
3065 default_bugs = []
3066 others = []
3067 for bug in bugs.split(','):
3068 bug = bug.strip()
3069 if bug:
3070 try:
3071 default_bugs.append(int(bug))
3072 except ValueError:
3073 others.append(bug)
3074
3075 if default_bugs:
3076 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003077 if default_project_prefix:
3078 if not default_project_prefix.endswith(':'):
3079 default_project_prefix += ':'
3080 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003081 else:
3082 yield default_bugs
3083 for other in sorted(others):
3084 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3085 yield other
3086
3087
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003088class ChangeDescription(object):
3089 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003090 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003091 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003092 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003093 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003094 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003095 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3096 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003097 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003098 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003099
Dan Beamd8b04ca2019-10-10 21:23:26 +00003100 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003101 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003102 if bug:
3103 regexp = re.compile(self.BUG_LINE)
3104 prefix = settings.GetBugPrefix()
3105 if not any((regexp.match(line) for line in self._description_lines)):
3106 values = list(_get_bug_line_values(prefix, bug))
3107 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003108 if fixed:
3109 regexp = re.compile(self.FIXED_LINE)
3110 prefix = settings.GetBugPrefix()
3111 if not any((regexp.match(line) for line in self._description_lines)):
3112 values = list(_get_bug_line_values(prefix, fixed))
3113 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003114
agable@chromium.org42c20792013-09-12 17:34:49 +00003115 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003116 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003117 return '\n'.join(self._description_lines)
3118
3119 def set_description(self, desc):
3120 if isinstance(desc, basestring):
3121 lines = desc.splitlines()
3122 else:
3123 lines = [line.rstrip() for line in desc]
3124 while lines and not lines[0]:
3125 lines.pop(0)
3126 while lines and not lines[-1]:
3127 lines.pop(-1)
3128 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003129
Edward Lemur5a644f82020-03-18 16:44:57 +00003130 def ensure_change_id(self, change_id):
3131 description = self.description
3132 footer_change_ids = git_footers.get_footer_change_id(description)
3133 # Make sure that the Change-Id in the description matches the given one.
3134 if footer_change_ids != [change_id]:
3135 if footer_change_ids:
3136 # Remove any existing Change-Id footers since they don't match the
3137 # expected change_id footer.
3138 description = git_footers.remove_footer(description, 'Change-Id')
3139 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3140 'if you want to set a new one.')
3141 # Add the expected Change-Id footer.
3142 description = git_footers.add_footer_change_id(description, change_id)
3143 self.set_description(description)
3144
Joanna Wang39811b12023-01-20 23:09:48 +00003145 def update_reviewers(self, reviewers):
3146 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003147
3148 Args:
3149 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003150 """
Joanna Wang39811b12023-01-20 23:09:48 +00003151 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003152 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003153
3154 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003155
Joanna Wang39811b12023-01-20 23:09:48 +00003156 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003157 regexp = re.compile(self.R_LINE)
3158 matches = [regexp.match(line) for line in self._description_lines]
3159 new_desc = [l for i, l in enumerate(self._description_lines)
3160 if not matches[i]]
3161 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003162
Joanna Wang39811b12023-01-20 23:09:48 +00003163 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003164
Joanna Wang39811b12023-01-20 23:09:48 +00003165 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003166 for match in matches:
3167 if not match:
3168 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003169 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003170
Joanna Wang39811b12023-01-20 23:09:48 +00003171 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003172
3173 # Put the new lines in the description where the old first R= line was.
3174 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3175 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003176 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003177 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003178 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003179
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003180 def set_preserve_tryjobs(self):
3181 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3182 footers = git_footers.parse_footers(self.description)
3183 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3184 if v.lower() == 'true':
3185 return
3186 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3187
Anthony Polito8b955342019-09-24 19:01:36 +00003188 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003189 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003190 self.set_description([
3191 '# Enter a description of the change.',
3192 '# This will be displayed on the codereview site.',
3193 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003194 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003195 '--------------------',
3196 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003197 bug_regexp = re.compile(self.BUG_LINE)
3198 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003199 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003200 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003201
Dan Beamd8b04ca2019-10-10 21:23:26 +00003202 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003203 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003204
Bruce Dawsonfc487042020-10-27 19:11:37 +00003205 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003206 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003207 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003208 if not content:
3209 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003210 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003211
Bruce Dawson2377b012018-01-11 16:46:49 -08003212 # Strip off comments and default inserted "Bug:" line.
3213 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003214 (line.startswith('#') or
3215 line.rstrip() == "Bug:" or
3216 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003217 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003218 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003219 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003220
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003221 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003222 """Adds a footer line to the description.
3223
3224 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3225 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3226 that Gerrit footers are always at the end.
3227 """
3228 parsed_footer_line = git_footers.parse_footer(line)
3229 if parsed_footer_line:
3230 # Line is a gerrit footer in the form: Footer-Key: any value.
3231 # Thus, must be appended observing Gerrit footer rules.
3232 self.set_description(
3233 git_footers.add_footer(self.description,
3234 key=parsed_footer_line[0],
3235 value=parsed_footer_line[1]))
3236 return
3237
3238 if not self._description_lines:
3239 self._description_lines.append(line)
3240 return
3241
3242 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3243 if gerrit_footers:
3244 # git_footers.split_footers ensures that there is an empty line before
3245 # actual (gerrit) footers, if any. We have to keep it that way.
3246 assert top_lines and top_lines[-1] == ''
3247 top_lines, separator = top_lines[:-1], top_lines[-1:]
3248 else:
3249 separator = [] # No need for separator if there are no gerrit_footers.
3250
3251 prev_line = top_lines[-1] if top_lines else ''
3252 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3253 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3254 top_lines.append('')
3255 top_lines.append(line)
3256 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003257
tandrii99a72f22016-08-17 14:33:24 -07003258 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003259 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003260 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003261 reviewers = [match.group(2).strip()
3262 for match in matches
3263 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003265
bradnelsond975b302016-10-23 12:20:23 -07003266 def get_cced(self):
3267 """Retrieves the list of reviewers."""
3268 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3269 cced = [match.group(2).strip() for match in matches if match]
3270 return cleanup_list(cced)
3271
Nodir Turakulov23b82142017-11-16 11:04:25 -08003272 def get_hash_tags(self):
3273 """Extracts and sanitizes a list of Gerrit hashtags."""
3274 subject = (self._description_lines or ('',))[0]
3275 subject = re.sub(
3276 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3277
3278 tags = []
3279 start = 0
3280 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3281 while True:
3282 m = bracket_exp.match(subject, start)
3283 if not m:
3284 break
3285 tags.append(self.sanitize_hash_tag(m.group(1)))
3286 start = m.end()
3287
3288 if not tags:
3289 # Try "Tag: " prefix.
3290 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3291 if m:
3292 tags.append(self.sanitize_hash_tag(m.group(1)))
3293 return tags
3294
3295 @classmethod
3296 def sanitize_hash_tag(cls, tag):
3297 """Returns a sanitized Gerrit hash tag.
3298
3299 A sanitized hashtag can be used as a git push refspec parameter value.
3300 """
3301 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3302
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003303
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003304def FindCodereviewSettingsFile(filename='codereview.settings'):
3305 """Finds the given file starting in the cwd and going up.
3306
3307 Only looks up to the top of the repository unless an
3308 'inherit-review-settings-ok' file exists in the root of the repository.
3309 """
3310 inherit_ok_file = 'inherit-review-settings-ok'
3311 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003312 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003313 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003314 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003315 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003316 if os.path.isfile(os.path.join(cwd, filename)):
3317 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003318 if cwd == root:
3319 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003320 parent_dir = os.path.dirname(cwd)
3321 if parent_dir == cwd:
3322 # We hit the system root directory.
3323 break
3324 cwd = parent_dir
3325 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003326
3327
3328def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003329 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003330 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003331
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003332 def SetProperty(name, setting, unset_error_ok=False):
3333 fullname = 'rietveld.' + name
3334 if setting in keyvals:
3335 RunGit(['config', fullname, keyvals[setting]])
3336 else:
3337 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3338
tandrii48df5812016-10-17 03:55:37 -07003339 if not keyvals.get('GERRIT_HOST', False):
3340 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003341 # Only server setting is required. Other settings can be absent.
3342 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003343 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003344 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3345 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003346 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003347 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3348 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003349 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3350 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003351 SetProperty(
3352 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003353 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003354
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003355 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003356 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003357
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003358 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003359 RunGit(['config', 'gerrit.squash-uploads',
3360 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003361
tandrii@chromium.org28253532016-04-14 13:46:56 +00003362 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003363 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003364 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3365
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003366 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003367 # should be of the form
3368 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3369 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003370 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3371 keyvals['ORIGIN_URL_CONFIG']])
3372
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003373
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003374def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003375 """Downloads a network object to a local file, like urllib.urlretrieve.
3376
3377 This is necessary because urllib is broken for SSL connections via a proxy.
3378 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003379 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003380 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003381
3382
ukai@chromium.org712d6102013-11-27 00:52:58 +00003383def hasSheBang(fname):
3384 """Checks fname is a #! script."""
3385 with open(fname) as f:
3386 return f.read(2).startswith('#!')
3387
3388
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003389def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003390 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003391
3392 Args:
3393 force: True to update hooks. False to install hooks if not present.
3394 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003395 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003396 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3397 if not os.access(dst, os.X_OK):
3398 if os.path.exists(dst):
3399 if not force:
3400 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003401 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003402 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003403 if not hasSheBang(dst):
3404 DieWithError('Not a script: %s\n'
3405 'You need to download from\n%s\n'
3406 'into .git/hooks/commit-msg and '
3407 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003408 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3409 except Exception:
3410 if os.path.exists(dst):
3411 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003412 DieWithError('\nFailed to download hooks.\n'
3413 'You need to download from\n%s\n'
3414 'into .git/hooks/commit-msg and '
3415 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003416
3417
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003418class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003419 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003420
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003421 def __init__(self):
3422 # Cached list of [host, identity, source], where source is either
3423 # .gitcookies or .netrc.
3424 self._all_hosts = None
3425
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003426 def ensure_configured_gitcookies(self):
3427 """Runs checks and suggests fixes to make git use .gitcookies from default
3428 path."""
3429 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3430 configured_path = RunGitSilent(
3431 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003432 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003433 if configured_path:
3434 self._ensure_default_gitcookies_path(configured_path, default)
3435 else:
3436 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003437
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003438 @staticmethod
3439 def _ensure_default_gitcookies_path(configured_path, default_path):
3440 assert configured_path
3441 if configured_path == default_path:
3442 print('git is already configured to use your .gitcookies from %s' %
3443 configured_path)
3444 return
3445
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003446 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003447 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3448 (configured_path, default_path))
3449
3450 if not os.path.exists(configured_path):
3451 print('However, your configured .gitcookies file is missing.')
3452 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3453 action='reconfigure')
3454 RunGit(['config', '--global', 'http.cookiefile', default_path])
3455 return
3456
3457 if os.path.exists(default_path):
3458 print('WARNING: default .gitcookies file already exists %s' %
3459 default_path)
3460 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3461 default_path)
3462
3463 confirm_or_exit('Move existing .gitcookies to default location?',
3464 action='move')
3465 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003466 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003467 print('Moved and reconfigured git to use .gitcookies from %s' %
3468 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003469
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003470 @staticmethod
3471 def _configure_gitcookies_path(default_path):
3472 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3473 if os.path.exists(netrc_path):
3474 print('You seem to be using outdated .netrc for git credentials: %s' %
3475 netrc_path)
3476 print('This tool will guide you through setting up recommended '
3477 '.gitcookies store for git credentials.\n'
3478 '\n'
3479 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3480 ' git config --global --unset http.cookiefile\n'
3481 ' mv %s %s.backup\n\n' % (default_path, default_path))
3482 confirm_or_exit(action='setup .gitcookies')
3483 RunGit(['config', '--global', 'http.cookiefile', default_path])
3484 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003485
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003486 def get_hosts_with_creds(self, include_netrc=False):
3487 if self._all_hosts is None:
3488 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003489 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3490 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3491 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3492 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003493
3494 if include_netrc:
3495 return self._all_hosts
3496 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3497
3498 def print_current_creds(self, include_netrc=False):
3499 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3500 if not hosts:
3501 print('No Git/Gerrit credentials found')
3502 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003503 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003504 header = [('Host', 'User', 'Which file'),
3505 ['=' * l for l in lengths]]
3506 for row in (header + hosts):
3507 print('\t'.join((('%%+%ds' % l) % s)
3508 for l, s in zip(lengths, row)))
3509
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003510 @staticmethod
3511 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003512 """Parses identity "git-<username>.domain" into <username> and domain."""
3513 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003514 # distinguishable from sub-domains. But we do know typical domains:
3515 if identity.endswith('.chromium.org'):
3516 domain = 'chromium.org'
3517 username = identity[:-len('.chromium.org')]
3518 else:
3519 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003520 if username.startswith('git-'):
3521 username = username[len('git-'):]
3522 return username, domain
3523
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003524 def has_generic_host(self):
3525 """Returns whether generic .googlesource.com has been configured.
3526
3527 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3528 """
3529 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003530 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003531 return True
3532 return False
3533
3534 def _get_git_gerrit_identity_pairs(self):
3535 """Returns map from canonic host to pair of identities (Git, Gerrit).
3536
3537 One of identities might be None, meaning not configured.
3538 """
3539 host_to_identity_pairs = {}
3540 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003541 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003542 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3543 idx = 0 if canonical == host else 1
3544 pair[idx] = identity
3545 return host_to_identity_pairs
3546
3547 def get_partially_configured_hosts(self):
3548 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003549 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003550 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003551 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003552
3553 def get_conflicting_hosts(self):
3554 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003555 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003556 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003557 if None not in (i1, i2) and i1 != i2)
3558
3559 def get_duplicated_hosts(self):
3560 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003561 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003562
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003563
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003564 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003565 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003566 hosts = sorted(hosts)
3567 assert hosts
3568 if extra_column_func is None:
3569 extras = [''] * len(hosts)
3570 else:
3571 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003572 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3573 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003574 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003575 lines.append(tmpl % he)
3576 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003577
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003578 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003579 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003580 yield ('.googlesource.com wildcard record detected',
3581 ['Chrome Infrastructure team recommends to list full host names '
3582 'explicitly.'],
3583 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003584
3585 dups = self.get_duplicated_hosts()
3586 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003587 yield ('The following hosts were defined twice',
3588 self._format_hosts(dups),
3589 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003590
3591 partial = self.get_partially_configured_hosts()
3592 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003593 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3594 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003595 self._format_hosts(
3596 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3597 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003598
3599 conflicting = self.get_conflicting_hosts()
3600 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003601 yield ('The following Git hosts have differing credentials from their '
3602 'Gerrit counterparts',
3603 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3604 tuple(self._get_git_gerrit_identity_pairs()[host])),
3605 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003606
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003607 def find_and_report_problems(self):
3608 """Returns True if there was at least one problem, else False."""
3609 found = False
3610 bad_hosts = set()
3611 for title, sublines, hosts in self._find_problems():
3612 if not found:
3613 found = True
3614 print('\n\n.gitcookies problem report:\n')
3615 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003616 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003617 if sublines:
3618 print()
3619 print(' %s' % '\n '.join(sublines))
3620 print()
3621
3622 if bad_hosts:
3623 assert found
3624 print(' You can manually remove corresponding lines in your %s file and '
3625 'visit the following URLs with correct account to generate '
3626 'correct credential lines:\n' %
3627 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003628 print(' %s' % '\n '.join(
3629 sorted(
3630 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3631 _canonical_git_googlesource_host(host))
3632 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003633 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003634
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003635
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003636@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003637def CMDcreds_check(parser, args):
3638 """Checks credentials and suggests changes."""
3639 _, _ = parser.parse_args(args)
3640
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003641 # Code below checks .gitcookies. Abort if using something else.
3642 authn = gerrit_util.Authenticator.get()
3643 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003644 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003645 'This command is not designed for bot environment. It checks '
3646 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003647 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3648 if isinstance(authn, gerrit_util.GceAuthenticator):
3649 message += (
3650 '\n'
3651 'If you need to run this on GCE or a cloudtop instance, '
3652 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3653 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003654
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003655 checker = _GitCookiesChecker()
3656 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003657
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003658 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003659 checker.print_current_creds(include_netrc=True)
3660
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003661 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003662 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003663 return 0
3664 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003665
3666
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003667@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003668def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003669 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003670 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003671 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003672 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003673 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003675 return RunGit(['config', 'branch.%s.base-url' % branch],
3676 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003677
3678 print('Setting base-url to %s' % args[0])
3679 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3680 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003681
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003682
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003683def color_for_status(status):
3684 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003685 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003686 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003687 'unsent': BOLD + Fore.YELLOW,
3688 'waiting': BOLD + Fore.RED,
3689 'reply': BOLD + Fore.YELLOW,
3690 'not lgtm': BOLD + Fore.RED,
3691 'lgtm': BOLD + Fore.GREEN,
3692 'commit': BOLD + Fore.MAGENTA,
3693 'closed': BOLD + Fore.CYAN,
3694 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003695 }.get(status, Fore.WHITE)
3696
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003697
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003698def get_cl_statuses(changes, fine_grained, max_processes=None):
3699 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003700
3701 If fine_grained is true, this will fetch CL statuses from the server.
3702 Otherwise, simply indicate if there's a matching url for the given branches.
3703
3704 If max_processes is specified, it is used as the maximum number of processes
3705 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3706 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003707
3708 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003709 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003710 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003711 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003712
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003713 if not fine_grained:
3714 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003715 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003716 for cl in changes:
3717 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003718 return
3719
3720 # First, sort out authentication issues.
3721 logging.debug('ensuring credentials exist')
3722 for cl in changes:
3723 cl.EnsureAuthenticated(force=False, refresh=True)
3724
3725 def fetch(cl):
3726 try:
3727 return (cl, cl.GetStatus())
3728 except:
3729 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003730 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003731 raise
3732
3733 threads_count = len(changes)
3734 if max_processes:
3735 threads_count = max(1, min(threads_count, max_processes))
3736 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3737
Edward Lemur61bf4172020-02-24 23:22:37 +00003738 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003739 fetched_cls = set()
3740 try:
3741 it = pool.imap_unordered(fetch, changes).__iter__()
3742 while True:
3743 try:
3744 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003745 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003746 break
3747 fetched_cls.add(cl)
3748 yield cl, status
3749 finally:
3750 pool.close()
3751
3752 # Add any branches that failed to fetch.
3753 for cl in set(changes) - fetched_cls:
3754 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003755
rmistry@google.com2dd99862015-06-22 12:22:18 +00003756
Jose Lopes3863fc52020-04-07 17:00:25 +00003757def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003758 """Uploads CLs of local branches that are dependents of the current branch.
3759
3760 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003761
3762 test1 -> test2.1 -> test3.1
3763 -> test3.2
3764 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003765
3766 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3767 run on the dependent branches in this order:
3768 test2.1, test3.1, test3.2, test2.2, test3.3
3769
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003770 Note: This function does not rebase your local dependent branches. Use it
3771 when you make a change to the parent branch that will not conflict
3772 with its dependent branches, and you would like their dependencies
3773 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003774 """
3775 if git_common.is_dirty_git_tree('upload-branch-deps'):
3776 return 1
3777
3778 root_branch = cl.GetBranch()
3779 if root_branch is None:
3780 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3781 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003782 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003783 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3784 'patchset dependencies without an uploaded CL.')
3785
3786 branches = RunGit(['for-each-ref',
3787 '--format=%(refname:short) %(upstream:short)',
3788 'refs/heads'])
3789 if not branches:
3790 print('No local branches found.')
3791 return 0
3792
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003793 # Create a dictionary of all local branches to the branches that are
3794 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003795 tracked_to_dependents = collections.defaultdict(list)
3796 for b in branches.splitlines():
3797 tokens = b.split()
3798 if len(tokens) == 2:
3799 branch_name, tracked = tokens
3800 tracked_to_dependents[tracked].append(branch_name)
3801
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print()
3803 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003804 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003805
rmistry@google.com2dd99862015-06-22 12:22:18 +00003806 def traverse_dependents_preorder(branch, padding=''):
3807 dependents_to_process = tracked_to_dependents.get(branch, [])
3808 padding += ' '
3809 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003810 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003811 dependents.append(dependent)
3812 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003813
rmistry@google.com2dd99862015-06-22 12:22:18 +00003814 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003816
3817 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003818 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003819 return 0
3820
Jose Lopes3863fc52020-04-07 17:00:25 +00003821 if not force:
3822 confirm_or_exit('This command will checkout all dependent branches and run '
3823 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003824
rmistry@google.com2dd99862015-06-22 12:22:18 +00003825 # Record all dependents that failed to upload.
3826 failures = {}
3827 # Go through all dependents, checkout the branch and upload.
3828 try:
3829 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003830 print()
3831 print('--------------------------------------')
3832 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003833 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835 try:
3836 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003837 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003838 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003839 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003840 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003841 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003842 finally:
3843 # Swap back to the original root branch.
3844 RunGit(['checkout', '-q', root_branch])
3845
vapiera7fbd5a2016-06-16 09:17:49 -07003846 print()
3847 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003848 for dependent_branch in dependents:
3849 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003850 print(' %s : %s' % (dependent_branch, upload_status))
3851 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003852
3853 return 0
3854
3855
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003856def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003857 """Given a proposed tag name, returns a tag name that is guaranteed to be
3858 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3859 or 'foo-3', and so on."""
3860
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003861 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003862 for suffix_num in itertools.count(1):
3863 if suffix_num == 1:
3864 to_check = proposed_tag
3865 else:
3866 to_check = '%s-%d' % (proposed_tag, suffix_num)
3867
3868 if to_check not in existing_tags:
3869 return to_check
3870
3871
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003872@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003873def CMDarchive(parser, args):
3874 """Archives and deletes branches associated with closed changelists."""
3875 parser.add_option(
3876 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003877 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003878 parser.add_option(
3879 '-f', '--force', action='store_true',
3880 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003881 parser.add_option(
3882 '-d', '--dry-run', action='store_true',
3883 help='Skip the branch tagging and removal steps.')
3884 parser.add_option(
3885 '-t', '--notags', action='store_true',
3886 help='Do not tag archived branches. '
3887 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003888 parser.add_option(
3889 '-p',
3890 '--pattern',
3891 default='git-cl-archived-{issue}-{branch}',
3892 help='Format string for archive tags. '
3893 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003894
kmarshall3bff56b2016-06-06 18:31:47 -07003895 options, args = parser.parse_args(args)
3896 if args:
3897 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003898
3899 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3900 if not branches:
3901 return 0
3902
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003903 tags = RunGit(['for-each-ref', '--format=%(refname)',
3904 'refs/tags']).splitlines() or []
3905 tags = [t.split('/')[-1] for t in tags]
3906
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003908 changes = [Changelist(branchref=b)
3909 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003910 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3911 statuses = get_cl_statuses(changes,
3912 fine_grained=True,
3913 max_processes=options.maxjobs)
3914 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003915 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3916 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003917 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003918 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003919 proposal.sort()
3920
3921 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003922 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003923 return 0
3924
Edward Lemur85153282020-02-14 22:06:29 +00003925 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003926
vapiera7fbd5a2016-06-16 09:17:49 -07003927 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003928 if options.notags:
3929 for next_item in proposal:
3930 print(' ' + next_item[0])
3931 else:
3932 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3933 for next_item in proposal:
3934 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003935
kmarshall9249e012016-08-23 12:02:16 -07003936 # Quit now on precondition failure or if instructed by the user, either
3937 # via an interactive prompt or by command line flags.
3938 if options.dry_run:
3939 print('\nNo changes were made (dry run).\n')
3940 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003941
3942 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003943 print('You are currently on a branch \'%s\' which is associated with a '
3944 'closed codereview issue, so archive cannot proceed. Please '
3945 'checkout another branch and run this command again.' %
3946 current_branch)
3947 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003948
3949 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003950 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003951 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003952 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003953 return 1
3954
3955 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003956 if not options.notags:
3957 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003958
3959 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3960 # Clean up the tag if we failed to delete the branch.
3961 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003962
vapiera7fbd5a2016-06-16 09:17:49 -07003963 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003964
3965 return 0
3966
3967
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003968@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003969def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003970 """Show status of changelists.
3971
3972 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003973 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003974 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003975 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003976 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003977 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003978 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003979 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003980
3981 Also see 'git cl comments'.
3982 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003983 parser.add_option(
3984 '--no-branch-color',
3985 action='store_true',
3986 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003987 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003988 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003989 parser.add_option('-f', '--fast', action='store_true',
3990 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003991 parser.add_option(
3992 '-j', '--maxjobs', action='store', type=int,
3993 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003994 parser.add_option(
3995 '-i', '--issue', type=int,
3996 help='Operate on this issue instead of the current branch\'s implicit '
3997 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003998 parser.add_option('-d',
3999 '--date-order',
4000 action='store_true',
4001 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004002 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004003 if args:
4004 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004005
iannuccie53c9352016-08-17 14:40:40 -07004006 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004007 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004009 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004010 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004011 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004012 if cl.GetIssue():
4013 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004014 elif options.field == 'id':
4015 issueid = cl.GetIssue()
4016 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004017 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004018 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004019 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004020 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004021 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004022 elif options.field == 'status':
4023 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004024 elif options.field == 'url':
4025 url = cl.GetIssueURL()
4026 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004028 return 0
4029
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004030 branches = RunGit([
4031 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4032 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004033 if not branches:
4034 print('No local branch found.')
4035 return 0
4036
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004037 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004038 Changelist(branchref=b, commit_date=ct)
4039 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4040 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004041 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004042 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004043 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004044 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004045
Edward Lemur85153282020-02-14 22:06:29 +00004046 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004047
4048 def FormatBranchName(branch, colorize=False):
4049 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4050 an asterisk when it is the current branch."""
4051
4052 asterisk = ""
4053 color = Fore.RESET
4054 if branch == current_branch:
4055 asterisk = "* "
4056 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004057 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004058
4059 if colorize:
4060 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004061 return asterisk + branch_name
4062
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004063 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004064
4065 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004066
4067 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004068 sorted_changes = sorted(changes,
4069 key=lambda c: c.GetCommitDate(),
4070 reverse=True)
4071 else:
4072 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4073 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004074 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004075 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004076 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004077 branch_statuses[c.GetBranch()] = status
4078 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004079 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004080 if url and (not status or status == 'error'):
4081 # The issue probably doesn't exist anymore.
4082 url += ' (broken)'
4083
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004084 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004085 # Turn off bold as well as colors.
4086 END = '\033[0m'
4087 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004088 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004089 color = ''
4090 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004091 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004092
Alan Cuttera3be9a52019-03-04 18:50:33 +00004093 branch_display = FormatBranchName(branch)
4094 padding = ' ' * (alignment - len(branch_display))
4095 if not options.no_branch_color:
4096 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004097
Alan Cuttera3be9a52019-03-04 18:50:33 +00004098 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4099 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004100
vapiera7fbd5a2016-06-16 09:17:49 -07004101 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004102 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004103 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004104 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004105 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004106 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004107 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004108 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004110 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004111 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004112 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004113 return 0
4114
4115
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004116def colorize_CMDstatus_doc():
4117 """To be called once in main() to add colors to git cl status help."""
4118 colors = [i for i in dir(Fore) if i[0].isupper()]
4119
4120 def colorize_line(line):
4121 for color in colors:
4122 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004123 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004124 indent = len(line) - len(line.lstrip(' ')) + 1
4125 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4126 return line
4127
4128 lines = CMDstatus.__doc__.splitlines()
4129 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4130
4131
phajdan.jre328cf92016-08-22 04:12:17 -07004132def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004133 if path == '-':
4134 json.dump(contents, sys.stdout)
4135 else:
4136 with open(path, 'w') as f:
4137 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004138
4139
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004140@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004141@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004142def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004143 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144
4145 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004146 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004147 parser.add_option('-r', '--reverse', action='store_true',
4148 help='Lookup the branch(es) for the specified issues. If '
4149 'no issues are specified, all branches with mapped '
4150 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004151 parser.add_option('--json',
4152 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004153 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004154
dnj@chromium.org406c4402015-03-03 17:22:28 +00004155 if options.reverse:
4156 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004157 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004158 # Reverse issue lookup.
4159 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004160
4161 git_config = {}
4162 for config in RunGit(['config', '--get-regexp',
4163 r'branch\..*issue']).splitlines():
4164 name, _space, val = config.partition(' ')
4165 git_config[name] = val
4166
dnj@chromium.org406c4402015-03-03 17:22:28 +00004167 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004168 issue = git_config.get(
4169 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004170 if issue:
4171 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004172 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004173 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004174 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004175 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004176 try:
4177 issue_num = int(issue)
4178 except ValueError:
4179 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004180 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004181 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004183 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004184 if options.json:
4185 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004186 return 0
4187
4188 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004189 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004190 if not issue.valid:
4191 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4192 'or no argument to list it.\n'
4193 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004194 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004195 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004196 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004197 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004198 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4199 if options.json:
4200 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004201 'gerrit_host': cl.GetGerritHost(),
4202 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004203 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004204 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004205 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004206 return 0
4207
4208
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004209@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004210def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004211 """Shows or posts review comments for any changelist."""
4212 parser.add_option('-a', '--add-comment', dest='comment',
4213 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004214 parser.add_option('-p', '--publish', action='store_true',
4215 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004216 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004217 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004218 parser.add_option('-m', '--machine-readable', dest='readable',
4219 action='store_false', default=True,
4220 help='output comments in a format compatible with '
4221 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004222 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004223 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004224 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004225
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004226 issue = None
4227 if options.issue:
4228 try:
4229 issue = int(options.issue)
4230 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004231 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004232
Edward Lemur934836a2019-09-09 20:16:54 +00004233 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004234
4235 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004236 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004237 return 0
4238
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004239 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4240 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004241 for comment in summary:
4242 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004243 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004244 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004245 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004246 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004247 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004248 elif comment.autogenerated:
4249 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004250 else:
4251 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004252 print('\n%s%s %s%s\n%s' % (
4253 color,
4254 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4255 comment.sender,
4256 Fore.RESET,
4257 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4258
smut@google.comc85ac942015-09-15 16:34:43 +00004259 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004260 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004261 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004262 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4263 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004264 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004265 return 0
4266
4267
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004268@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004269@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004270def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004271 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004272 parser.add_option('-d', '--display', action='store_true',
4273 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004274 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004275 help='New description to set for this issue (- for stdin, '
4276 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004277 parser.add_option('-f', '--force', action='store_true',
4278 help='Delete any unpublished Gerrit edits for this issue '
4279 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004280
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004281 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004282
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004283 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004284 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004285 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004286 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004287 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004288
Edward Lemur934836a2019-09-09 20:16:54 +00004289 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004290 if target_issue_arg:
4291 kwargs['issue'] = target_issue_arg.issue
4292 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004293
4294 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004295 if not cl.GetIssue():
4296 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004297
Edward Lemur678a6842019-10-03 22:25:05 +00004298 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004299 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004300
Edward Lemur6c6827c2020-02-06 21:15:18 +00004301 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004302
smut@google.com34fb6b12015-07-13 20:03:26 +00004303 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004305 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004306
4307 if options.new_description:
4308 text = options.new_description
4309 if text == '-':
4310 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004311 elif text == '+':
4312 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004313 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004314
4315 description.set_description(text)
4316 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004317 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004318 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004319 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004320 return 0
4321
4322
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004323@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004324def CMDlint(parser, args):
4325 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004326 parser.add_option('--filter', action='append', metavar='-x,+y',
4327 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004328 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004329
4330 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004331 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004332 try:
4333 import cpplint
4334 import cpplint_chromium
4335 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004336 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004337 return 1
4338
4339 # Change the current working directory before calling lint so that it
4340 # shows the correct base.
4341 previous_cwd = os.getcwd()
4342 os.chdir(settings.GetRoot())
4343 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004344 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004345 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004346 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004347 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004348 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004349
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004350 # Process cpplint arguments, if any.
4351 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4352 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004353 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004354
Lei Zhang379d1ad2020-07-15 19:40:06 +00004355 include_regex = re.compile(settings.GetLintRegex())
4356 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004357 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4358 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004359 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004360 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004361 continue
4362
4363 if ignore_regex.match(filename):
4364 print('Ignoring file %s' % filename)
4365 continue
4366
4367 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4368 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004369 finally:
4370 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004371 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004372 if cpplint._cpplint_state.error_count != 0:
4373 return 1
4374 return 0
4375
4376
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004377@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004378def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004379 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004380 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004381 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004382 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004383 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004384 parser.add_option('--all', action='store_true',
4385 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004386 parser.add_option('--files',
4387 nargs=1,
4388 help='Semicolon-separated list of files to be marked as '
4389 'modified when executing presubmit or post-upload hooks. '
4390 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004391 parser.add_option('--parallel', action='store_true',
4392 help='Run all tests specified by input_api.RunTests in all '
4393 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004394 parser.add_option('--resultdb', action='store_true',
4395 help='Run presubmit checks in the ResultSink environment '
4396 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004397 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004398 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004399
sbc@chromium.org71437c02015-04-09 19:29:40 +00004400 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004401 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004402 return 1
4403
Edward Lemur934836a2019-09-09 20:16:54 +00004404 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004405 if args:
4406 base_branch = args[0]
4407 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004408 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004409 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004410
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004411 start = time.time()
4412 try:
4413 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4414 description = cl.FetchDescription()
4415 else:
4416 description = _create_description_from_log([base_branch])
4417 except Exception as e:
4418 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004419 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004420 elapsed = time.time() - start
4421 if elapsed > 5:
4422 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004423
Bruce Dawson13acea32022-05-03 22:13:08 +00004424 if not base_branch:
4425 if not options.force:
4426 print('use --force to check even when not on a branch.')
4427 return 1
4428 base_branch = 'HEAD'
4429
Josip Sokcevic017544d2022-03-31 23:47:53 +00004430 cl.RunHook(committing=not options.upload,
4431 may_prompt=False,
4432 verbose=options.verbose,
4433 parallel=options.parallel,
4434 upstream=base_branch,
4435 description=description,
4436 all_files=options.all,
4437 files=options.files,
4438 resultdb=options.resultdb,
4439 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004440 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441
4442
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004443def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004444 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004445
4446 Works the same way as
4447 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4448 but can be called on demand on all platforms.
4449
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004450 The basic idea is to generate git hash of a state of the tree, original
4451 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004452 """
4453 lines = []
4454 tree_hash = RunGitSilent(['write-tree'])
4455 lines.append('tree %s' % tree_hash.strip())
4456 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4457 if code == 0:
4458 lines.append('parent %s' % parent.strip())
4459 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4460 lines.append('author %s' % author.strip())
4461 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4462 lines.append('committer %s' % committer.strip())
4463 lines.append('')
4464 # Note: Gerrit's commit-hook actually cleans message of some lines and
4465 # whitespace. This code is not doing this, but it clearly won't decrease
4466 # entropy.
4467 lines.append(message)
4468 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004469 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004470 return 'I%s' % change_hash.strip()
4471
4472
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004473def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004474 """Computes the remote branch ref to use for the CL.
4475
4476 Args:
4477 remote (str): The git remote for the CL.
4478 remote_branch (str): The git remote branch for the CL.
4479 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004480 """
4481 if not (remote and remote_branch):
4482 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004483
wittman@chromium.org455dc922015-01-26 20:15:50 +00004484 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004485 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004486 # refs, which are then translated into the remote full symbolic refs
4487 # below.
4488 if '/' not in target_branch:
4489 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4490 else:
4491 prefix_replacements = (
4492 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4493 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4494 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4495 )
4496 match = None
4497 for regex, replacement in prefix_replacements:
4498 match = re.search(regex, target_branch)
4499 if match:
4500 remote_branch = target_branch.replace(match.group(0), replacement)
4501 break
4502 if not match:
4503 # This is a branch path but not one we recognize; use as-is.
4504 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004505 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004506 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004507 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004508 # Handle the refs that need to land in different refs.
4509 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004510
wittman@chromium.org455dc922015-01-26 20:15:50 +00004511 # Create the true path to the remote branch.
4512 # Does the following translation:
4513 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004514 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004515 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4516 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4517 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4518 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4519 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4520 'refs/heads/')
4521 elif remote_branch.startswith('refs/remotes/branch-heads'):
4522 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004523
wittman@chromium.org455dc922015-01-26 20:15:50 +00004524 return remote_branch
4525
4526
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004527def cleanup_list(l):
4528 """Fixes a list so that comma separated items are put as individual items.
4529
4530 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4531 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4532 """
4533 items = sum((i.split(',') for i in l), [])
4534 stripped_items = (i.strip() for i in items)
4535 return sorted(filter(None, stripped_items))
4536
4537
Aaron Gable4db38df2017-11-03 14:59:07 -07004538@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004539@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004540def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004541 """Uploads the current changelist to codereview.
4542
4543 Can skip dependency patchset uploads for a branch by running:
4544 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004545 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004546 git config --unset branch.branch_name.skip-deps-uploads
4547 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004548
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004549 If the name of the checked out branch starts with "bug-" or "fix-" followed
4550 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004551 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004552
4553 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004554 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004555 [git-cl] add support for hashtags
4556 Foo bar: implement foo
4557 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004558 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004559 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4560 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004561 parser.add_option('--bypass-watchlists', action='store_true',
4562 dest='bypass_watchlists',
4563 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004564 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004565 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004566 parser.add_option('--message', '-m', dest='message',
4567 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004568 parser.add_option('-b', '--bug',
4569 help='pre-populate the bug number(s) for this issue. '
4570 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004571 parser.add_option('--message-file', dest='message_file',
4572 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004573 parser.add_option('--title', '-t', dest='title',
4574 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004575 parser.add_option('-T', '--skip-title', action='store_true',
4576 dest='skip_title',
4577 help='Use the most recent commit message as the title of '
4578 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004579 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004580 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004581 help='reviewer email addresses')
4582 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004583 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004584 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004585 parser.add_option('--hashtag', dest='hashtags',
4586 action='append', default=[],
4587 help=('Gerrit hashtag for new CL; '
4588 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004589 parser.add_option('-s',
4590 '--send-mail',
4591 '--send-email',
4592 dest='send_mail',
4593 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004594 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004595 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004596 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004597 metavar='TARGET',
4598 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004599 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004600 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004601 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004602 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004603 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004604 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004605 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004606 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4607 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004608 parser.add_option('-c',
4609 '--use-commit-queue',
4610 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004611 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004612 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004613 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004614 parser.add_option('-d', '--cq-dry-run',
4615 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004616 help='Send the patchset to do a CQ dry run right after '
4617 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004618 parser.add_option(
4619 '-q',
4620 '--cq-quick-run',
4621 action='store_true',
4622 default=False,
4623 help='Send the patchset to do a CQ quick run right after '
4624 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4625 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004626 parser.add_option('--set-bot-commit', action='store_true',
4627 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004628 parser.add_option('--preserve-tryjobs', action='store_true',
4629 help='instruct the CQ to let tryjobs running even after '
4630 'new patchsets are uploaded instead of canceling '
4631 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004632 parser.add_option('--dependencies', action='store_true',
4633 help='Uploads CLs of all the local branches that depend on '
4634 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004635 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4636 help='Sends your change to the CQ after an approval. Only '
4637 'works on repos that have the Auto-Submit label '
4638 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004639 parser.add_option('--parallel', action='store_true',
4640 help='Run all tests specified by input_api.RunTests in all '
4641 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004642 parser.add_option('--no-autocc', action='store_true',
4643 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004644 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004645 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004646 parser.add_option('-R', '--retry-failed', action='store_true',
4647 help='Retry failed tryjobs from old patchset immediately '
4648 'after uploading new patchset. Cannot be used with '
4649 '--use-commit-queue or --cq-dry-run.')
4650 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4651 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004652 parser.add_option('--fixed', '-x',
4653 help='List of bugs that will be commented on and marked '
4654 'fixed (pre-populates "Fixed:" tag). Same format as '
4655 '-b option / "Bug:" tag. If fixing several issues, '
4656 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004657 parser.add_option('--edit-description', action='store_true', default=False,
4658 help='Modify description before upload. Cannot be used '
4659 'with --force. It is a noop when --no-squash is set '
4660 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004661 parser.add_option('--git-completion-helper', action="store_true",
4662 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004663 parser.add_option('--resultdb', action='store_true',
4664 help='Run presubmit checks in the ResultSink environment '
4665 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004666 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004667 parser.add_option('-o',
4668 '--push-options',
4669 action='append',
4670 default=[],
4671 help='Transmit the given string to the server when '
4672 'performing git push (pass-through). See git-push '
4673 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004674 parser.add_option('--no-add-changeid',
4675 action='store_true',
4676 dest='no_add_changeid',
4677 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004678 parser.add_option('--no-python2-post-upload-hooks',
4679 action='store_true',
4680 help='Only run post-upload hooks in Python 3.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004681 parser.add_option('--stacked-exp',
4682 action='store_true',
4683 help=optparse.SUPPRESS_HELP)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004684
rmistry@google.com2dd99862015-06-22 12:22:18 +00004685 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004686 (options, args) = parser.parse_args(args)
4687
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004688 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004689 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4690 if opt.help != optparse.SUPPRESS_HELP))
4691 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004692
sbc@chromium.org71437c02015-04-09 19:29:40 +00004693 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004694 return 1
4695
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004696 options.reviewers = cleanup_list(options.reviewers)
4697 options.cc = cleanup_list(options.cc)
4698
Josipe827b0f2020-01-30 00:07:20 +00004699 if options.edit_description and options.force:
4700 parser.error('Only one of --force and --edit-description allowed')
4701
tandriib80458a2016-06-23 12:20:07 -07004702 if options.message_file:
4703 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004704 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004705 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004706
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004707 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004708 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004709 options.use_commit_queue,
4710 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004711 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4712 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004713
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004714 if options.skip_title and options.title:
4715 parser.error('Only one of --title and --skip-title allowed.')
4716
Aaron Gableedbc4132017-09-11 13:22:28 -07004717 if options.use_commit_queue:
4718 options.send_mail = True
4719
Edward Lesmes0dd54822020-03-26 18:24:25 +00004720 if options.squash is None:
4721 # Load default for user, repo, squash=true, in this order.
4722 options.squash = settings.GetSquashGerritUploads()
4723
Joanna Wang18de1f62023-01-21 01:24:24 +00004724 if options.stacked_exp:
4725 orig_args.remove('--stacked-exp')
4726
4727 UploadAllSquashed(options, orig_args)
4728 return 0
4729
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004730 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004731 # Warm change details cache now to avoid RPCs later, reducing latency for
4732 # developers.
4733 if cl.GetIssue():
4734 cl._GetChangeDetail(
4735 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4736
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004737 if options.retry_failed and not cl.GetIssue():
4738 print('No previous patchsets, so --retry-failed has no effect.')
4739 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004740
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004741 # cl.GetMostRecentPatchset uses cached information, and can return the last
4742 # patchset before upload. Calling it here makes it clear that it's the
4743 # last patchset before upload. Note that GetMostRecentPatchset will fail
4744 # if no CL has been uploaded yet.
4745 if options.retry_failed:
4746 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004747
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004748 ret = cl.CMDUpload(options, args, orig_args)
4749
4750 if options.retry_failed:
4751 if ret != 0:
4752 print('Upload failed, so --retry-failed has no effect.')
4753 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004754 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004755 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004756 jobs = _filter_failed_for_retry(builds)
4757 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004758 print('No failed tryjobs, so --retry-failed has no effect.')
4759 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004760 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004761
4762 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004763
4764
Joanna Wang18de1f62023-01-21 01:24:24 +00004765def UploadAllSquashed(options, orig_args):
4766 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4767 """Uploads the current and upstream branches (if necessary)."""
4768 _cls, _cherry_pick_current = _UploadAllPrecheck(options, orig_args)
4769
4770 # TODO(b/265929888): parse cls and create commits.
4771
4772
4773def _UploadAllPrecheck(options, orig_args):
4774 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4775 """Checks the state of the tree and gives the user uploading options
4776
4777 Returns: A tuple of the ordered list of changes that have new commits
4778 since their last upload and a boolean of whether the user wants to
4779 cherry-pick and upload the current branch instead of uploading all cls.
4780 """
4781 branch_ref = None
4782 cls = []
4783 must_upload_upstream = False
4784
4785 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4786
4787 while True:
4788 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4789 DieWithError(
4790 'More than %s branches in the stack have not been uploaded.\n'
4791 'Are your branches in a misconfigured state?\n'
4792 'If not, please upload some upstream changes first.' %
4793 (_MAX_STACKED_BRANCHES_UPLOAD))
4794
4795 cl = Changelist(branchref=branch_ref)
4796 cls.append(cl)
4797
4798 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
4799 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4800 branch_ref = upstream_branch_ref # set branch for next run.
4801
4802 # Case 1: We've reached the beginning of the tree.
4803 if origin != '.':
4804 break
4805
4806 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4807 upstream_branch,
4808 LAST_UPLOAD_HASH_CONFIG_KEY)
4809
4810 # Case 2: If any upstream branches have never been uploaded,
4811 # the user MUST upload them.
4812 if not upstream_last_upload:
4813 must_upload_upstream = True
4814 continue
4815
4816 base_commit = cl.GetCommonAncestorWithUpstream()
4817
4818 # Case 3: If upstream's last_upload == cl.base_commit we do
4819 # not need to upload any more upstreams from this point on.
4820 # (Even if there may be diverged branches higher up the tree)
4821 if base_commit == upstream_last_upload:
4822 break
4823
4824 # Case 4: If upstream's last_upload < cl.base_commit we are
4825 # uploading cl and upstream_cl.
4826 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004827 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004828 continue
4829
4830 # Case 5: If cl.base_commit < upstream's last_upload the user
4831 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004832 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004833 DieWithError(
4834 'At least one branch in the stack has diverged from its upstream '
4835 'branch and does not contain its upstream\'s last upload.\n'
4836 'Please rebase the stack with `git rebase-update` before uploading.')
4837
4838 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
4839 # any relation to commits in the tree. Continue up the tree until we hit
4840 # the root.
4841
4842 # We assume all cls in the stack have the same auth requirements and only
4843 # check this once.
4844 cls[0].EnsureAuthenticated(force=options.force)
4845
4846 cherry_pick = False
4847 if len(cls) > 1:
4848 message = ''
4849 if len(orig_args):
4850 message = ('options %s will be used for all uploads.\n' % orig_args)
4851 if must_upload_upstream:
4852 confirm_or_exit('\n' + message +
4853 'There are upstream branches that must be uploaded.\n')
4854 else:
4855 answer = gclient_utils.AskForData(
4856 '\n' + message +
4857 'Press enter to update branches %s.\nOr type `n` to upload only '
4858 '`%s` cherry-picked on %s\'s last upload:' %
4859 ([cl.branch for cl in cls], cls[0].branch, cls[1].branch))
4860 if answer.lower() == 'n':
4861 cherry_pick = True
4862 return cls, cherry_pick
4863
4864
Francois Dorayd42c6812017-05-30 15:10:20 -04004865@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004866@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004867def CMDsplit(parser, args):
4868 """Splits a branch into smaller branches and uploads CLs.
4869
4870 Creates a branch and uploads a CL for each group of files modified in the
4871 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004872 comment, the string '$directory', is replaced with the directory containing
4873 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004874 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004875 parser.add_option('-d', '--description', dest='description_file',
4876 help='A text file containing a CL description in which '
4877 '$directory will be replaced by each CL\'s directory.')
4878 parser.add_option('-c', '--comment', dest='comment_file',
4879 help='A text file containing a CL comment.')
4880 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004881 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004882 help='List the files and reviewers for each CL that would '
4883 'be created, but don\'t create branches or CLs.')
4884 parser.add_option('--cq-dry-run', action='store_true',
4885 help='If set, will do a cq dry run for each uploaded CL. '
4886 'Please be careful when doing this; more than ~10 CLs '
4887 'has the potential to overload our build '
4888 'infrastructure. Try to upload these not during high '
4889 'load times (usually 11-3 Mountain View time). Email '
4890 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004891 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4892 default=True,
4893 help='Sends your change to the CQ after an approval. Only '
4894 'works on repos that have the Auto-Submit label '
4895 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004896 parser.add_option('--max-depth',
4897 type='int',
4898 default=0,
4899 help='The max depth to look for OWNERS files. Useful for '
4900 'controlling the granularity of the split CLs, e.g. '
4901 '--max-depth=1 will only split by top-level '
4902 'directory. Specifying a value less than 1 means no '
4903 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004904 options, _ = parser.parse_args(args)
4905
4906 if not options.description_file:
4907 parser.error('No --description flag specified.')
4908
4909 def WrappedCMDupload(args):
4910 return CMDupload(OptionParser(), args)
4911
Daniel Cheng403c44e2022-10-05 22:24:58 +00004912 return split_cl.SplitCl(options.description_file, options.comment_file,
4913 Changelist, WrappedCMDupload, options.dry_run,
4914 options.cq_dry_run, options.enable_auto_submit,
4915 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004916
4917
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004918@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004919@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004920def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004921 """DEPRECATED: Used to commit the current changelist via git-svn."""
4922 message = ('git-cl no longer supports committing to SVN repositories via '
4923 'git-svn. You probably want to use `git cl land` instead.')
4924 print(message)
4925 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004926
4927
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004928@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004929@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004930def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004931 """Commits the current changelist via git.
4932
4933 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4934 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004935 """
4936 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4937 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004938 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004939 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004940 parser.add_option('--parallel', action='store_true',
4941 help='Run all tests specified by input_api.RunTests in all '
4942 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004943 parser.add_option('--resultdb', action='store_true',
4944 help='Run presubmit checks in the ResultSink environment '
4945 'and send results to the ResultDB database.')
4946 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004947 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004948
Edward Lemur934836a2019-09-09 20:16:54 +00004949 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004950
Robert Iannucci2e73d432018-03-14 01:10:47 -07004951 if not cl.GetIssue():
4952 DieWithError('You must upload the change first to Gerrit.\n'
4953 ' If you would rather have `git cl land` upload '
4954 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004955 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4956 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004957
4958
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004959@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004960@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004961def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004962 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004963 parser.add_option('-b', dest='newbranch',
4964 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004965 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004966 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004967 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004968 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004969
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004970 group = optparse.OptionGroup(
4971 parser,
4972 'Options for continuing work on the current issue uploaded from a '
4973 'different clone (e.g. different machine). Must be used independently '
4974 'from the other options. No issue number should be specified, and the '
4975 'branch must have an issue number associated with it')
4976 group.add_option('--reapply', action='store_true', dest='reapply',
4977 help='Reset the branch and reapply the issue.\n'
4978 'CAUTION: This will undo any local changes in this '
4979 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004980
4981 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004982 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004983 parser.add_option_group(group)
4984
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004985 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004986
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004987 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004988 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004989 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004990 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004991 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004992
Edward Lemur934836a2019-09-09 20:16:54 +00004993 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004994 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004995 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004996
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004997 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004998 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004999 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005000
5001 RunGit(['reset', '--hard', upstream])
5002 if options.pull:
5003 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005004
Edward Lemur678a6842019-10-03 22:25:05 +00005005 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005006 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
5007 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005008
5009 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005010 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005011
Edward Lemurf38bc172019-09-03 21:02:13 +00005012 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005013 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005014 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005015
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005016 # We don't want uncommitted changes mixed up with the patch.
5017 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005018 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005019
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005020 if options.newbranch:
5021 if options.force:
5022 RunGit(['branch', '-D', options.newbranch],
5023 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005024 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005025
Edward Lemur678a6842019-10-03 22:25:05 +00005026 cl = Changelist(
5027 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005028
Edward Lemur678a6842019-10-03 22:25:05 +00005029 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005030 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005031
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005032 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5033 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005034
5035
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005036def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005037 """Fetches the tree status and returns either 'open', 'closed',
5038 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005039 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005040 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005041 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005042 if status.find('closed') != -1 or status == '0':
5043 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005044
5045 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005046 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005047
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005048 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005049 return 'unset'
5050
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005051
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005052def GetTreeStatusReason():
5053 """Fetches the tree status from a json url and returns the message
5054 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005055 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005056 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005057 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005058 status = json.loads(connection.read())
5059 connection.close()
5060 return status['message']
5061
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005062
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005063@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005064def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005065 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005066 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005067 status = GetTreeStatus()
5068 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005069 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005070 return 2
5071
vapiera7fbd5a2016-06-16 09:17:49 -07005072 print('The tree is %s' % status)
5073 print()
5074 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005075 if status != 'open':
5076 return 1
5077 return 0
5078
5079
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005080@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005081def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005082 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5083 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005084 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005085 '-b', '--bot', action='append',
5086 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5087 'times to specify multiple builders. ex: '
5088 '"-b win_rel -b win_layout". See '
5089 'the try server waterfall for the builders name and the tests '
5090 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005091 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005092 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005093 help=('Buildbucket bucket to send the try requests. Format: '
5094 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005095 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005096 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005097 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005098 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005099 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005100 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005101 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005102 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005103 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005104 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005105 '-q',
5106 '--quick-run',
5107 action='store_true',
5108 default=False,
5109 help='trigger in quick run mode '
5110 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5111 'uick_run.md) (chromium only).')
5112 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005113 '--category', default='git_cl_try', help='Specify custom build category.')
5114 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005115 '--project',
5116 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005117 'in recipe to determine to which repository or directory to '
5118 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005119 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005120 '-p', '--property', dest='properties', action='append', default=[],
5121 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005122 'key2=value2 etc. The value will be treated as '
5123 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005124 'NOTE: using this may make your tryjob not usable for CQ, '
5125 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005126 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005127 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5128 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005129 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005130 parser.add_option(
5131 '-R', '--retry-failed', action='store_true', default=False,
5132 help='Retry failed jobs from the latest set of tryjobs. '
5133 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005134 parser.add_option(
5135 '-i', '--issue', type=int,
5136 help='Operate on this issue instead of the current branch\'s implicit '
5137 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005138 options, args = parser.parse_args(args)
5139
machenbach@chromium.org45453142015-09-15 08:45:22 +00005140 # Make sure that all properties are prop=value pairs.
5141 bad_params = [x for x in options.properties if '=' not in x]
5142 if bad_params:
5143 parser.error('Got properties with missing "=": %s' % bad_params)
5144
maruel@chromium.org15192402012-09-06 12:38:29 +00005145 if args:
5146 parser.error('Unknown arguments: %s' % args)
5147
Edward Lemur934836a2019-09-09 20:16:54 +00005148 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005149 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005150 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005151
Edward Lemurf38bc172019-09-03 21:02:13 +00005152 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005153 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005154
tandriie113dfd2016-10-11 10:20:12 -07005155 error_message = cl.CannotTriggerTryJobReason()
5156 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005157 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005158
Edward Lemur45768512020-03-02 19:03:14 +00005159 if options.bot:
5160 if options.retry_failed:
5161 parser.error('--bot is not compatible with --retry-failed.')
5162 if not options.bucket:
5163 parser.error('A bucket (e.g. "chromium/try") is required.')
5164
5165 triggered = [b for b in options.bot if 'triggered' in b]
5166 if triggered:
5167 parser.error(
5168 'Cannot schedule builds on triggered bots: %s.\n'
5169 'This type of bot requires an initial job from a parent (usually a '
5170 'builder). Schedule a job on the parent instead.\n' % triggered)
5171
5172 if options.bucket.startswith('.master'):
5173 parser.error('Buildbot masters are not supported.')
5174
5175 project, bucket = _parse_bucket(options.bucket)
5176 if project is None or bucket is None:
5177 parser.error('Invalid bucket: %s.' % options.bucket)
5178 jobs = sorted((project, bucket, bot) for bot in options.bot)
5179 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005180 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00005181 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005182 if options.verbose:
5183 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005184 jobs = _filter_failed_for_retry(builds)
5185 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005186 print('There are no failed jobs in the latest set of jobs '
5187 '(patchset #%d), doing nothing.' % patchset)
5188 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005189 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005190 if num_builders > 10:
5191 confirm_or_exit('There are %d builders with failed builds.'
5192 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005193 elif options.quick_run:
5194 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5195 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005196 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005197 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005198 print('git cl try with no bots now defaults to CQ dry run.')
5199 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5200 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005201
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005202 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005203 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005204 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005205 except BuildbucketResponseException as ex:
5206 print('ERROR: %s' % ex)
5207 return 1
5208 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005209
5210
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005211@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005212def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005213 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005214 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005215 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005216 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005217 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005218 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005219 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005220 '--color', action='store_true', default=setup_color.IS_TTY,
5221 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005222 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005223 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5224 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005225 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005226 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005227 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005228 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005229 parser.add_option(
5230 '-i', '--issue', type=int,
5231 help='Operate on this issue instead of the current branch\'s implicit '
5232 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005233 options, args = parser.parse_args(args)
5234 if args:
5235 parser.error('Unrecognized args: %s' % ' '.join(args))
5236
Edward Lemur934836a2019-09-09 20:16:54 +00005237 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005238 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005239 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005240
tandrii221ab252016-10-06 08:12:04 -07005241 patchset = options.patchset
5242 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005243 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005244 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005245 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005246 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005247 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005248 cl.GetIssue())
5249
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005250 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005251 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005252 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005253 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005254 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005255 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005256 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005257 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005258 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005259 return 0
5260
5261
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005262@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005263@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005264def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005265 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005266 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005267 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005268 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005269
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005270 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005271 if args:
5272 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005273 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005274 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005275 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005276 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005277
5278 # Clear configured merge-base, if there is one.
5279 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005280 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005281 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005282 return 0
5283
5284
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005285@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005286def CMDweb(parser, args):
5287 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005288 parser.add_option('-p',
5289 '--print-only',
5290 action='store_true',
5291 dest='print_only',
5292 help='Only print the Gerrit URL, don\'t open it in the '
5293 'browser.')
5294 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005295 if args:
5296 parser.error('Unrecognized args: %s' % ' '.join(args))
5297
5298 issue_url = Changelist().GetIssueURL()
5299 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005300 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005301 return 1
5302
Orr Bernstein0b960582022-12-22 20:16:18 +00005303 if options.print_only:
5304 print(issue_url)
5305 return 0
5306
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005307 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005308 # allows us to hide the "Created new window in existing browser session."
5309 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005310 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005311 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005312 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005313 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005314 os.open(os.devnull, os.O_RDWR)
5315 try:
5316 webbrowser.open(issue_url)
5317 finally:
5318 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005319 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005320 return 0
5321
5322
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005323@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005324def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005325 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005326 parser.add_option('-d', '--dry-run', action='store_true',
5327 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005328 parser.add_option(
5329 '-q',
5330 '--quick-run',
5331 action='store_true',
5332 help='trigger in quick run mode '
5333 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5334 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005335 parser.add_option('-c', '--clear', action='store_true',
5336 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005337 parser.add_option(
5338 '-i', '--issue', type=int,
5339 help='Operate on this issue instead of the current branch\'s implicit '
5340 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005341 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005342 if args:
5343 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005344 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5345 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005346
Edward Lemur934836a2019-09-09 20:16:54 +00005347 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005348 if not cl.GetIssue():
5349 parser.error('Must upload the issue first.')
5350
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005351 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005352 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005353 elif options.quick_run:
5354 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005355 elif options.dry_run:
5356 state = _CQState.DRY_RUN
5357 else:
5358 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005359 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005360 return 0
5361
5362
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005363@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005364def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005365 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005366 parser.add_option(
5367 '-i', '--issue', type=int,
5368 help='Operate on this issue instead of the current branch\'s implicit '
5369 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005370 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005371 if args:
5372 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005373 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005374 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005375 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005376 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005377 cl.CloseIssue()
5378 return 0
5379
5380
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005381@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005382def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005383 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005384 parser.add_option(
5385 '--stat',
5386 action='store_true',
5387 dest='stat',
5388 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005389 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005390 if args:
5391 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005392
Edward Lemur934836a2019-09-09 20:16:54 +00005393 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005394 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005395 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005396 if not issue:
5397 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005398
Gavin Makbe2e9262022-11-08 23:41:55 +00005399 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005400 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005401 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005402 if not base:
5403 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5404 revision_info = detail['revisions'][detail['current_revision']]
5405 fetch_info = revision_info['fetch']['http']
5406 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5407 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005408
Aaron Gablea718c3e2017-08-28 17:47:28 -07005409 cmd = ['git', 'diff']
5410 if options.stat:
5411 cmd.append('--stat')
5412 cmd.append(base)
5413 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005414
5415 return 0
5416
5417
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005418@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005419def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005420 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005421 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005422 '--ignore-current',
5423 action='store_true',
5424 help='Ignore the CL\'s current reviewers and start from scratch.')
5425 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005426 '--ignore-self',
5427 action='store_true',
5428 help='Do not consider CL\'s author as an owners.')
5429 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005430 '--no-color',
5431 action='store_true',
5432 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005433 parser.add_option(
5434 '--batch',
5435 action='store_true',
5436 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005437 # TODO: Consider moving this to another command, since other
5438 # git-cl owners commands deal with owners for a given CL.
5439 parser.add_option(
5440 '--show-all',
5441 action='store_true',
5442 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005443 options, args = parser.parse_args(args)
5444
Edward Lemur934836a2019-09-09 20:16:54 +00005445 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005446 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005447
Yang Guo6e269a02019-06-26 11:17:02 +00005448 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005449 if len(args) == 0:
5450 print('No files specified for --show-all. Nothing to do.')
5451 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005452 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005453 for path in args:
5454 print('Owners for %s:' % path)
5455 print('\n'.join(
5456 ' - %s' % owner
5457 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005458 return 0
5459
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005460 if args:
5461 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005462 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005463 base_branch = args[0]
5464 else:
5465 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005466 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005467
Edward Lemur2c62b332020-03-12 22:12:33 +00005468 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005469
5470 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005471 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5472 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005473 return 0
5474
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005475 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005476 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005477 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005478 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005479 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005480 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005481 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005482
5483
Aiden Bennerc08566e2018-10-03 17:52:42 +00005484def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005485 """Generates a diff command."""
5486 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005487 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5488
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005489 if allow_prefix:
5490 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5491 # case that diff.noprefix is set in the user's git config.
5492 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5493 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005494 diff_cmd += ['--no-prefix']
5495
5496 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005497
5498 if args:
5499 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005500 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005501 diff_cmd.append(arg)
5502 else:
5503 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005504
5505 return diff_cmd
5506
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005507
Jamie Madill5e96ad12020-01-13 16:08:35 +00005508def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5509 """Runs clang-format-diff and sets a return value if necessary."""
5510
5511 if not clang_diff_files:
5512 return 0
5513
5514 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5515 # formatted. This is used to block during the presubmit.
5516 return_value = 0
5517
5518 # Locate the clang-format binary in the checkout
5519 try:
5520 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5521 except clang_format.NotFoundError as e:
5522 DieWithError(e)
5523
5524 if opts.full or settings.GetFormatFullByDefault():
5525 cmd = [clang_format_tool]
5526 if not opts.dry_run and not opts.diff:
5527 cmd.append('-i')
5528 if opts.dry_run:
5529 for diff_file in clang_diff_files:
5530 with open(diff_file, 'r') as myfile:
5531 code = myfile.read().replace('\r\n', '\n')
5532 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5533 stdout = stdout.replace('\r\n', '\n')
5534 if opts.diff:
5535 sys.stdout.write(stdout)
5536 if code != stdout:
5537 return_value = 2
5538 else:
5539 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5540 if opts.diff:
5541 sys.stdout.write(stdout)
5542 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005543 try:
5544 script = clang_format.FindClangFormatScriptInChromiumTree(
5545 'clang-format-diff.py')
5546 except clang_format.NotFoundError as e:
5547 DieWithError(e)
5548
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005549 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005550 if not opts.dry_run and not opts.diff:
5551 cmd.append('-i')
5552
5553 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005554 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005555
Edward Lesmes89624cd2020-04-06 17:51:56 +00005556 env = os.environ.copy()
5557 env['PATH'] = (
5558 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5559 stdout = RunCommand(
5560 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005561 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005562 if opts.diff:
5563 sys.stdout.write(stdout)
5564 if opts.dry_run and len(stdout) > 0:
5565 return_value = 2
5566
5567 return return_value
5568
5569
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005570def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5571 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5572 presubmit checks have failed (and returns 0 otherwise)."""
5573
5574 if not rust_diff_files:
5575 return 0
5576
5577 # Locate the rustfmt binary.
5578 try:
5579 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5580 except rustfmt.NotFoundError as e:
5581 DieWithError(e)
5582
5583 # TODO(crbug.com/1231317): Support formatting only the changed lines
5584 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5585 # https://github.com/emilio/rustfmt-format-diff
5586 cmd = [rustfmt_tool]
5587 if opts.dry_run:
5588 cmd.append('--check')
5589 cmd += rust_diff_files
5590 rustfmt_exitcode = subprocess2.call(cmd)
5591
5592 if opts.presubmit and rustfmt_exitcode != 0:
5593 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005594
5595 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005596
5597
Olivier Robin0a6b5442022-04-07 07:25:04 +00005598def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5599 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5600 that presubmit checks have failed (and returns 0 otherwise)."""
5601
5602 if not swift_diff_files:
5603 return 0
5604
5605 # Locate the swift-format binary.
5606 try:
5607 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5608 except swift_format.NotFoundError as e:
5609 DieWithError(e)
5610
5611 cmd = [swift_format_tool]
5612 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005613 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005614 else:
5615 cmd += ['format', '-i']
5616 cmd += swift_diff_files
5617 swift_format_exitcode = subprocess2.call(cmd)
5618
5619 if opts.presubmit and swift_format_exitcode != 0:
5620 return 2
5621
5622 return 0
5623
5624
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005625def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005626 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005627 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005628
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005629
enne@chromium.org555cfe42014-01-29 18:21:39 +00005630@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005631@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005632def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005633 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005634 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005635 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005636 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005637 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005638 parser.add_option('--full', action='store_true',
5639 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005640 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005641 parser.add_option('--dry-run', action='store_true',
5642 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005643 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005644 '--no-clang-format',
5645 dest='clang_format',
5646 action='store_false',
5647 default=True,
5648 help='Disables formatting of various file types using clang-format.')
5649 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005650 '--python',
5651 action='store_true',
5652 default=None,
5653 help='Enables python formatting on all python files.')
5654 parser.add_option(
5655 '--no-python',
5656 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005657 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005658 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005659 'If neither --python or --no-python are set, python files that have a '
5660 '.style.yapf file in an ancestor directory will be formatted. '
5661 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005662 parser.add_option(
5663 '--js',
5664 action='store_true',
5665 help='Format javascript code with clang-format. '
5666 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005667 parser.add_option('--diff', action='store_true',
5668 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005669 parser.add_option('--presubmit', action='store_true',
5670 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005671
5672 parser.add_option('--rust-fmt',
5673 dest='use_rust_fmt',
5674 action='store_true',
5675 default=rustfmt.IsRustfmtSupported(),
5676 help='Enables formatting of Rust file types using rustfmt.')
5677 parser.add_option(
5678 '--no-rust-fmt',
5679 dest='use_rust_fmt',
5680 action='store_false',
5681 help='Disables formatting of Rust file types using rustfmt.')
5682
Olivier Robin0a6b5442022-04-07 07:25:04 +00005683 parser.add_option(
5684 '--swift-format',
5685 dest='use_swift_format',
5686 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005687 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005688 help='Enables formatting of Swift file types using swift-format '
5689 '(macOS host only).')
5690 parser.add_option(
5691 '--no-swift-format',
5692 dest='use_swift_format',
5693 action='store_false',
5694 help='Disables formatting of Swift file types using swift-format.')
5695
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005696 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005697
Garrett Beaty91a6f332020-01-06 16:57:24 +00005698 if opts.python is not None and opts.no_python:
5699 raise parser.error('Cannot set both --python and --no-python')
5700 if opts.no_python:
5701 opts.python = False
5702
Daniel Chengc55eecf2016-12-30 03:11:02 -08005703 # Normalize any remaining args against the current path, so paths relative to
5704 # the current directory are still resolved as expected.
5705 args = [os.path.join(os.getcwd(), arg) for arg in args]
5706
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005707 # git diff generates paths against the root of the repository. Change
5708 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005709 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005710 if rel_base_path:
5711 os.chdir(rel_base_path)
5712
digit@chromium.org29e47272013-05-17 17:01:46 +00005713 # Grab the merge-base commit, i.e. the upstream commit of the current
5714 # branch when it was created or the last time it was rebased. This is
5715 # to cover the case where the user may have called "git fetch origin",
5716 # moving the origin branch to a newer commit, but hasn't rebased yet.
5717 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005718 upstream_branch = opts.upstream
5719 if not upstream_branch:
5720 cl = Changelist()
5721 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005722 if upstream_branch:
5723 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5724 upstream_commit = upstream_commit.strip()
5725
5726 if not upstream_commit:
5727 DieWithError('Could not find base commit for this branch. '
5728 'Are you in detached state?')
5729
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005730 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5731 diff_output = RunGit(changed_files_cmd)
5732 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005733 # Filter out files deleted by this CL
5734 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005735
Andreas Haas417d89c2020-02-06 10:24:27 +00005736 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005737 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005738
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005739 clang_diff_files = []
5740 if opts.clang_format:
5741 clang_diff_files = [
5742 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5743 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005744 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005745 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005746 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005747 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005748
Edward Lesmes50da7702020-03-30 19:23:43 +00005749 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005750
Jamie Madill5e96ad12020-01-13 16:08:35 +00005751 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5752 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005753
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005754 if opts.use_rust_fmt:
5755 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5756 upstream_commit)
5757 if rust_fmt_return_value == 2:
5758 return_value = 2
5759
Olivier Robin0a6b5442022-04-07 07:25:04 +00005760 if opts.use_swift_format:
5761 if sys.platform != 'darwin':
5762 DieWithError('swift-format is only supported on macOS.')
5763 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5764 upstream_commit)
5765 if swift_format_return_value == 2:
5766 return_value = 2
5767
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005768 # Similar code to above, but using yapf on .py files rather than clang-format
5769 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005770 py_explicitly_disabled = opts.python is not None and not opts.python
5771 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005772 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5773 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005774
Aiden Bennerc08566e2018-10-03 17:52:42 +00005775 # Used for caching.
5776 yapf_configs = {}
5777 for f in python_diff_files:
5778 # Find the yapf style config for the current file, defaults to depot
5779 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005780 _FindYapfConfigFile(f, yapf_configs, top_dir)
5781
5782 # Turn on python formatting by default if a yapf config is specified.
5783 # This breaks in the case of this repo though since the specified
5784 # style file is also the global default.
5785 if opts.python is None:
5786 filtered_py_files = []
5787 for f in python_diff_files:
5788 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5789 filtered_py_files.append(f)
5790 else:
5791 filtered_py_files = python_diff_files
5792
5793 # Note: yapf still seems to fix indentation of the entire file
5794 # even if line ranges are specified.
5795 # See https://github.com/google/yapf/issues/499
5796 if not opts.full and filtered_py_files:
5797 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5798
Brian Sheedyb4307d52019-12-02 19:18:17 +00005799 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5800 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5801 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005802
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005803 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005804 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5805 # Default to pep8 if not .style.yapf is found.
5806 if not yapf_style:
5807 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005808
Peter Wend9399922020-06-17 17:33:49 +00005809 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005810 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005811 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005812 else:
5813 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005814
5815 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005816
5817 has_formattable_lines = False
5818 if not opts.full:
5819 # Only run yapf over changed line ranges.
5820 for diff_start, diff_len in py_line_diffs[f]:
5821 diff_end = diff_start + diff_len - 1
5822 # Yapf errors out if diff_end < diff_start but this
5823 # is a valid line range diff for a removal.
5824 if diff_end >= diff_start:
5825 has_formattable_lines = True
5826 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5827 # If all line diffs were removals we have nothing to format.
5828 if not has_formattable_lines:
5829 continue
5830
5831 if opts.diff or opts.dry_run:
5832 cmd += ['--diff']
5833 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005834 stdout = RunCommand(cmd,
5835 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005836 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005837 cwd=top_dir,
5838 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005839 if opts.diff:
5840 sys.stdout.write(stdout)
5841 elif len(stdout) > 0:
5842 return_value = 2
5843 else:
5844 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005845 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005846
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005847 # Format GN build files. Always run on full build files for canonical form.
5848 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005849 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005850 if opts.dry_run or opts.diff:
5851 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005852 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005853 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005854 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005855 cwd=top_dir)
5856 if opts.dry_run and gn_ret == 2:
5857 return_value = 2 # Not formatted.
5858 elif opts.diff and gn_ret == 2:
5859 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005860 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005861 elif gn_ret != 0:
5862 # For non-dry run cases (and non-2 return values for dry-run), a
5863 # nonzero error code indicates a failure, probably because the file
5864 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005865 DieWithError('gn format failed on ' + gn_diff_file +
5866 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005867
Ilya Shermane081cbe2017-08-15 17:51:04 -07005868 # Skip the metrics formatting from the global presubmit hook. These files have
5869 # a separate presubmit hook that issues an error if the files need formatting,
5870 # whereas the top-level presubmit script merely issues a warning. Formatting
5871 # these files is somewhat slow, so it's important not to duplicate the work.
5872 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005873 for diff_xml in GetDiffXMLs(diff_files):
5874 xml_dir = GetMetricsDir(diff_xml)
5875 if not xml_dir:
5876 continue
5877
Ilya Shermane081cbe2017-08-15 17:51:04 -07005878 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005879 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005880 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005881
5882 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5883 # command as histograms/pretty_print.py now needs a relative path argument
5884 # after splitting the histograms into multiple directories.
5885 # For example, in tools/metrics/ukm, pretty-print could be run using:
5886 # $ python pretty_print.py
5887 # But in tools/metrics/histogrmas, pretty-print should be run with an
5888 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005889 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005890 # $ python pretty_print.py enums.xml
5891
Weilun Shib92c4b72020-08-27 17:45:11 +00005892 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005893 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005894 cmd.append(diff_xml)
5895
Ilya Shermane081cbe2017-08-15 17:51:04 -07005896 if opts.dry_run or opts.diff:
5897 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005898
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005899 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5900 # `shell` param and instead replace `'vpython'` with
5901 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005902 stdout = RunCommand(cmd,
5903 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005904 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005905 if opts.diff:
5906 sys.stdout.write(stdout)
5907 if opts.dry_run and stdout:
5908 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005909
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005910 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005911
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005912
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005913def GetDiffXMLs(diff_files):
5914 return [
5915 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5916 ]
5917
5918
5919def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005920 metrics_xml_dirs = [
5921 os.path.join('tools', 'metrics', 'actions'),
5922 os.path.join('tools', 'metrics', 'histograms'),
5923 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005924 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005925 os.path.join('tools', 'metrics', 'ukm'),
5926 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005927 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005928 if diff_xml.startswith(xml_dir):
5929 return xml_dir
5930 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005931
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005932
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005933@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005934@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005935def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005936 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005937 _, args = parser.parse_args(args)
5938
5939 if len(args) != 1:
5940 parser.print_help()
5941 return 1
5942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005943 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005944 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005945 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005946
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005947 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005948
Edward Lemur52969c92020-02-06 18:15:28 +00005949 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005950 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005951 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005952
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005953 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005954 for key, issue in [x.split() for x in output.splitlines()]:
5955 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005956 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005957
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005958 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005959 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005960 return 1
5961 if len(branches) == 1:
5962 RunGit(['checkout', branches[0]])
5963 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005964 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005965 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005966 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005967 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005968 try:
5969 RunGit(['checkout', branches[int(which)]])
5970 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005971 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005972 return 1
5973
5974 return 0
5975
5976
maruel@chromium.org29404b52014-09-08 22:58:00 +00005977def CMDlol(parser, args):
5978 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005979 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005980 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5981 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5982 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005983 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005984 return 0
5985
5986
Josip Sokcevic0399e172022-03-21 23:11:51 +00005987def CMDversion(parser, args):
5988 import utils
5989 print(utils.depot_tools_version())
5990
5991
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005992class OptionParser(optparse.OptionParser):
5993 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005994
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005995 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005996 optparse.OptionParser.__init__(
5997 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005998 self.add_option(
5999 '-v', '--verbose', action='count', default=0,
6000 help='Use 2 times for more debugging info')
6001
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006002 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006003 try:
6004 return self._parse_args(args)
6005 finally:
6006 # Regardless of success or failure of args parsing, we want to report
6007 # metrics, but only after logging has been initialized (if parsing
6008 # succeeded).
6009 global settings
6010 settings = Settings()
6011
Edward Lesmes9c349062021-05-06 20:02:39 +00006012 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006013 # GetViewVCUrl ultimately calls logging method.
6014 project_url = settings.GetViewVCUrl().strip('/+')
6015 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6016 metrics.collector.add('project_urls', [project_url])
6017
6018 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006019 # Create an optparse.Values object that will store only the actual passed
6020 # options, without the defaults.
6021 actual_options = optparse.Values()
6022 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6023 # Create an optparse.Values object with the default options.
6024 options = optparse.Values(self.get_default_values().__dict__)
6025 # Update it with the options passed by the user.
6026 options._update_careful(actual_options.__dict__)
6027 # Store the options passed by the user in an _actual_options attribute.
6028 # We store only the keys, and not the values, since the values can contain
6029 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006030 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006031
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006032 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006033 logging.basicConfig(
6034 level=levels[min(options.verbose, len(levels) - 1)],
6035 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6036 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006037
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006038 return options, args
6039
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006040
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006041def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006042 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006043 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006044 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006045 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006046
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006047 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006048 dispatcher = subcommand.CommandDispatcher(__name__)
6049 try:
6050 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006051 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006052 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006053 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006054 if e.code != 500:
6055 raise
6056 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006057 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006058 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006059 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006060
6061
6062if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006063 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6064 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006065 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006066 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006067 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006068 sys.exit(main(sys.argv[1:]))