blob: 6ea84984133baa65a28d3e97d89eebeaeda144cd [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 Wange8523912023-01-21 02:05:40 +00001579 def PrepareCherryPickSquashedCommit(self, options):
1580 # type: (optparse.Values) -> _NewUpload()
1581 """Create a commit cherry-picked on parent to push."""
1582
1583 parent = self.GetCommonAncestorWithUpstream()
1584 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1585 self.branchref)
1586
1587 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1588 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1589 with gclient_utils.temporary_file() as desc_tempfile:
1590 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1591 commit_to_cp = RunGit(
1592 ['commit-tree', latest_tree, '-p', parent, '-F',
1593 desc_tempfile]).strip()
1594
1595 _, upstream_branch_ref = self.FetchUpstreamTuple(self.GetBranch())
1596
1597 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
1598 upstream_squashed_upload = scm.GIT.GetBranchConfig(
1599 settings.GetRoot(), upstream_branch, GERRIT_SQUASH_HASH_CONFIG_KEY)
1600
1601 RunGit(['checkout', '-q', upstream_squashed_upload])
1602 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1603 if ret:
1604 RunGit(['cherry-pick', '--abort'])
1605 RunGit(['checkout', '-q', self.branch])
1606 DieWithError('Could not cleanly cherry-pick')
1607
1608 commit_to_push = RunGit(['rev-parse', 'HEAD'])
1609 RunGit(['checkout', '-q', self.branch])
1610
1611 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
1612 change_desc)
1613
Joanna Wangb46232e2023-01-21 01:58:46 +00001614 def _PrepareChange(self, options, parent, end_commit):
1615 # type: (optparse.Values, str, str) ->
1616 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1617 """Prepares the change to be uploaded."""
1618 self.EnsureCanUploadPatchset(options.force)
1619
1620 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1621 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1622 files)
1623
1624 watchlist = watchlists.Watchlists(settings.GetRoot())
1625 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1626 if not options.bypass_hooks:
1627 hook_results = self.RunHook(committing=False,
1628 may_prompt=not options.force,
1629 verbose=options.verbose,
1630 parallel=options.parallel,
1631 upstream=parent,
1632 description=change_desc.description,
1633 all_files=False)
1634 self.ExtendCC(hook_results['more_cc'])
1635
1636 # Update the change description and ensure we have a Change Id.
1637 if self.GetIssue():
1638 if options.edit_description:
1639 change_desc.prompt()
1640 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1641 change_id = change_detail['change_id']
1642 change_desc.ensure_change_id(change_id)
1643
1644 # TODO(b/265929888): Pull in external changes for the current branch
1645 # only. No clear way to pull in external changes for upstream branches
1646 # yet. Potentially offer a separate command to pull in external changes.
1647 else: # No change issue. First time uploading
1648 if not options.force and not options.message_file:
1649 change_desc.prompt()
1650
1651 # Check if user added a change_id in the descripiton.
1652 change_ids = git_footers.get_footer_change_id(change_desc.description)
1653 if len(change_ids) == 1:
1654 change_id = change_ids[0]
1655 else:
1656 change_id = GenerateGerritChangeId(change_desc.description)
1657 change_desc.ensure_change_id(change_id)
1658
1659 if options.preserve_tryjobs:
1660 change_desc.set_preserve_tryjobs()
1661
1662 SaveDescriptionBackup(change_desc)
1663
1664 # Add ccs
1665 ccs = []
1666 # Add default, watchlist, presubmit ccs if this is an existing change
1667 # and CL is not private and auto-ccing has not been disabled.
1668 if self.GetIssue() and not (options.private and options.no_autocc):
1669 ccs = self.GetCCList().split(',')
1670 if len(ccs) > 100:
1671 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1672 'process/lsc/lsc_workflow.md')
1673 print('WARNING: This will auto-CC %s users.' % len(ccs))
1674 print('LSC may be more appropriate: %s' % lsc)
1675 print('You can also use the --no-autocc flag to disable auto-CC.')
1676 confirm_or_exit(action='continue')
1677
1678 # Add ccs from the --cc flag.
1679 if options.cc:
1680 ccs.extend(options.cc)
1681
1682 ccs = [email.strip() for email in ccs if email.strip()]
1683 if change_desc.get_cced():
1684 ccs.extend(change_desc.get_cced())
1685
1686 return change_desc.get_reviewers(), ccs, change_desc
1687
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001688 def CMDUpload(self, options, git_diff_args, orig_args):
1689 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001690 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001691 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001692 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001693 else:
1694 if self.GetBranch() is None:
1695 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1696
1697 # Default to diffing against common ancestor of upstream branch
1698 base_branch = self.GetCommonAncestorWithUpstream()
1699 git_diff_args = [base_branch, 'HEAD']
1700
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001701 # Fast best-effort checks to abort before running potentially expensive
1702 # hooks if uploading is likely to fail anyway. Passing these checks does
1703 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001704 self.EnsureAuthenticated(force=options.force)
1705 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001706
1707 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001708 watchlist = watchlists.Watchlists(settings.GetRoot())
1709 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001710 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001711 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001712
Edward Lemur5a644f82020-03-18 16:44:57 +00001713 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001714 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001715 hook_results = self.RunHook(
1716 committing=False,
1717 may_prompt=not options.force,
1718 verbose=options.verbose,
1719 parallel=options.parallel,
1720 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001721 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001722 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001723 resultdb=options.resultdb,
1724 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001725 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001726
Aaron Gable13101a62018-02-09 13:20:41 -08001727 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001728 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001729 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001730 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001731 if self.GetBranch() is not None:
1732 self._GitSetBranchConfigValue(
1733 LAST_UPLOAD_HASH_CONFIG_KEY,
1734 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001735 # Run post upload hooks, if specified.
1736 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001737 self.RunPostUploadHook(options.verbose, base_branch,
1738 change_desc.description,
1739 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001740
1741 # Upload all dependencies if specified.
1742 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001743 print()
1744 print('--dependencies has been specified.')
1745 print('All dependent local branches will be re-uploaded.')
1746 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001747 # Remove the dependencies flag from args so that we do not end up in a
1748 # loop.
1749 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001750 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001751 return ret
1752
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001753 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001754 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001755
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001756 Issue must have been already uploaded and known. Optionally allows for
1757 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001758 """
1759 assert new_state in _CQState.ALL_STATES
1760 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001761 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001762 vote_map = {
1763 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001764 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001765 _CQState.DRY_RUN: 1,
1766 _CQState.COMMIT: 2,
1767 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001768 if new_state == _CQState.QUICK_RUN:
1769 labels = {
1770 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1771 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1772 }
1773 else:
1774 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001775 notify = False if new_state == _CQState.DRY_RUN else None
1776 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001777 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001778 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001779 return 0
1780 except KeyboardInterrupt:
1781 raise
1782 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001783 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001784 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001785 ' * Your project has no CQ,\n'
1786 ' * You don\'t have permission to change the CQ state,\n'
1787 ' * There\'s a bug in this code (see stack trace below).\n'
1788 'Consider specifying which bots to trigger manually or asking your '
1789 'project owners for permissions or contacting Chrome Infra at:\n'
1790 'https://www.chromium.org/infra\n\n' %
1791 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001792 # Still raise exception so that stack trace is printed.
1793 raise
1794
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001795 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 # Lazy load of configs.
1797 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001798 if self._gerrit_host and '.' not in self._gerrit_host:
1799 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1800 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001801 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001802 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001803 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001804 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001805 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1806 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 return self._gerrit_host
1808
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001809 def _GetGitHost(self):
1810 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001811 remote_url = self.GetRemoteUrl()
1812 if not remote_url:
1813 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001814 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001815
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 def GetCodereviewServer(self):
1817 if not self._gerrit_server:
1818 # If we're on a branch then get the server potentially associated
1819 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001820 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001821 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001822 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001823 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001824 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 if not self._gerrit_server:
1826 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1827 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001828 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001829 parts[0] = parts[0] + '-review'
1830 self._gerrit_host = '.'.join(parts)
1831 self._gerrit_server = 'https://%s' % self._gerrit_host
1832 return self._gerrit_server
1833
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001834 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001835 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001836 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001837 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001838 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001839 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001840 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001841 if project.endswith('.git'):
1842 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001843 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1844 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1845 # gitiles/git-over-https protocol. E.g.,
1846 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1847 # as
1848 # https://chromium.googlesource.com/v8/v8
1849 if project.startswith('a/'):
1850 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001851 return project
1852
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001853 def _GerritChangeIdentifier(self):
1854 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1855
1856 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001857 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001858 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001859 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001860 if project:
1861 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1862 # Fall back on still unique, but less efficient change number.
1863 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001864
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001865 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001866 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001867 if settings.GetGerritSkipEnsureAuthenticated():
1868 # For projects with unusual authentication schemes.
1869 # See http://crbug.com/603378.
1870 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001871
1872 # Check presence of cookies only if using cookies-based auth method.
1873 cookie_auth = gerrit_util.Authenticator.get()
1874 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001875 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001876
Florian Mayerae510e82020-01-30 21:04:48 +00001877 remote_url = self.GetRemoteUrl()
1878 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001879 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001880 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001881 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1882 logging.warning(
1883 'Ignoring branch %(branch)s with non-https/sso remote '
1884 '%(remote)s', {
1885 'branch': self.branch,
1886 'remote': self.GetRemoteUrl()
1887 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001888 return
1889
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001890 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001891 self.GetCodereviewServer()
1892 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001893 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001894
1895 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1896 git_auth = cookie_auth.get_auth_header(git_host)
1897 if gerrit_auth and git_auth:
1898 if gerrit_auth == git_auth:
1899 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001900 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001901 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001902 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001903 ' %s\n'
1904 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001905 ' Consider running the following command:\n'
1906 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001907 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001908 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001909 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001910 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001911 cookie_auth.get_new_password_message(git_host)))
1912 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001913 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001914 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001915
1916 missing = (
1917 ([] if gerrit_auth else [self._gerrit_host]) +
1918 ([] if git_auth else [git_host]))
1919 DieWithError('Credentials for the following hosts are required:\n'
1920 ' %s\n'
1921 'These are read from %s (or legacy %s)\n'
1922 '%s' % (
1923 '\n '.join(missing),
1924 cookie_auth.get_gitcookies_path(),
1925 cookie_auth.get_netrc_path(),
1926 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001927
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001928 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001929 if not self.GetIssue():
1930 return
1931
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001932 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001933 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001934 DieWithError(
1935 'Change %s has been abandoned, new uploads are not allowed' %
1936 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001937 if status == 'MERGED':
1938 answer = gclient_utils.AskForData(
1939 'Change %s has been submitted, new uploads are not allowed. '
1940 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1941 ).lower()
1942 if answer not in ('y', ''):
1943 DieWithError('New uploads are not allowed.')
1944 self.SetIssue()
1945 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001946
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001947 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1948 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1949 # Apparently this check is not very important? Otherwise get_auth_email
1950 # could have been added to other implementations of Authenticator.
1951 cookies_auth = gerrit_util.Authenticator.get()
1952 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001953 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001954
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001955 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001956 if self.GetIssueOwner() == cookies_user:
1957 return
1958 logging.debug('change %s owner is %s, cookies user is %s',
1959 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001960 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001961 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001962 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001963 if details['email'] == self.GetIssueOwner():
1964 return
1965 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001966 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001967 'as %s.\n'
1968 'Uploading may fail due to lack of permissions.' %
1969 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1970 confirm_or_exit(action='upload')
1971
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001972 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001973 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001974 or CQ status, assuming adherence to a common workflow.
1975
1976 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001977 * 'error' - error from review tool (including deleted issues)
1978 * 'unsent' - no reviewers added
1979 * 'waiting' - waiting for review
1980 * 'reply' - waiting for uploader to reply to review
1981 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001982 * 'dry-run' - dry-running in the CQ
1983 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001984 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001985 """
1986 if not self.GetIssue():
1987 return None
1988
1989 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001990 data = self._GetChangeDetail([
1991 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001992 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001993 return 'error'
1994
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001995 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001996 return 'closed'
1997
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001998 cq_label = data['labels'].get('Commit-Queue', {})
1999 max_cq_vote = 0
2000 for vote in cq_label.get('all', []):
2001 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2002 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002003 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002004 if max_cq_vote == 1:
2005 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002006
Aaron Gable9ab38c62017-04-06 14:36:33 -07002007 if data['labels'].get('Code-Review', {}).get('approved'):
2008 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002009
2010 if not data.get('reviewers', {}).get('REVIEWER', []):
2011 return 'unsent'
2012
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002013 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002014 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002015 while messages:
2016 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002017 if (m.get('tag', '').startswith('autogenerated:cq') or
2018 m.get('tag', '').startswith('autogenerated:cv')):
2019 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002020 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002021 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002022 # Most recent message was by owner.
2023 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002024
2025 # Some reply from non-owner.
2026 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002027
2028 # Somehow there are no messages even though there are reviewers.
2029 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002030
Gavin Mak4e5e3992022-11-14 22:40:12 +00002031 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002032 if not self.GetIssue():
2033 return None
2034
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002035 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002036 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002037 if update:
2038 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002039 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002040
Gavin Makf35a9eb2022-11-17 18:34:36 +00002041 def _IsPatchsetRangeSignificant(self, lower, upper):
2042 """Returns True if the inclusive range of patchsets contains any reworks or
2043 rebases."""
2044 if not self.GetIssue():
2045 return False
2046
2047 data = self._GetChangeDetail(['ALL_REVISIONS'])
2048 ps_kind = {}
2049 for rev_info in data.get('revisions', {}).values():
2050 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2051
2052 for ps in range(lower, upper + 1):
2053 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2054 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2055 return True
2056 return False
2057
Gavin Make61ccc52020-11-13 00:12:57 +00002058 def GetMostRecentDryRunPatchset(self):
2059 """Get patchsets equivalent to the most recent patchset and return
2060 the patchset with the latest dry run. If none have been dry run, return
2061 the latest patchset."""
2062 if not self.GetIssue():
2063 return None
2064
2065 data = self._GetChangeDetail(['ALL_REVISIONS'])
2066 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002067 dry_run = {int(m['_revision_number'])
2068 for m in data.get('messages', [])
2069 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002070
2071 for revision_info in sorted(data.get('revisions', {}).values(),
2072 key=lambda c: c['_number'], reverse=True):
2073 if revision_info['_number'] in dry_run:
2074 patchset = revision_info['_number']
2075 break
2076 if revision_info.get('kind', '') not in \
2077 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2078 break
2079 self.SetPatchset(patchset)
2080 return patchset
2081
Aaron Gable636b13f2017-07-14 10:42:48 -07002082 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002083 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002084 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002085 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002086
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002087 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002088 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002089 # CURRENT_REVISION is included to get the latest patchset so that
2090 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002091 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002092 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2093 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002094 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002095 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002096 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002097 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002098
2099 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002100 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002101 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002102 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002103 line_comments = file_comments.setdefault(path, [])
2104 line_comments.extend(
2105 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002106
2107 # Build dictionary of file comments for easy access and sorting later.
2108 # {author+date: {path: {patchset: {line: url+message}}}}
2109 comments = collections.defaultdict(
2110 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002111
2112 server = self.GetCodereviewServer()
2113 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2114 # /c/ is automatically added by short URL server.
2115 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2116 self.GetIssue())
2117 else:
2118 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2119
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002120 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002121 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002122 tag = comment.get('tag', '')
2123 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002124 continue
2125 key = (comment['author']['email'], comment['updated'])
2126 if comment.get('side', 'REVISION') == 'PARENT':
2127 patchset = 'Base'
2128 else:
2129 patchset = 'PS%d' % comment['patch_set']
2130 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002131 url = ('%s/%s/%s#%s%s' %
2132 (url_prefix, comment['patch_set'], path,
2133 'b' if comment.get('side') == 'PARENT' else '',
2134 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002135 comments[key][path][patchset][line] = (url, comment['message'])
2136
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002137 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002138 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002139 summary = self._BuildCommentSummary(msg, comments, readable)
2140 if summary:
2141 summaries.append(summary)
2142 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002143
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002144 @staticmethod
2145 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002146 if 'email' not in msg['author']:
2147 # Some bot accounts may not have an email associated.
2148 return None
2149
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002150 key = (msg['author']['email'], msg['date'])
2151 # Don't bother showing autogenerated messages that don't have associated
2152 # file or line comments. this will filter out most autogenerated
2153 # messages, but will keep robot comments like those from Tricium.
2154 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2155 if is_autogenerated and not comments.get(key):
2156 return None
2157 message = msg['message']
2158 # Gerrit spits out nanoseconds.
2159 assert len(msg['date'].split('.')[-1]) == 9
2160 date = datetime.datetime.strptime(msg['date'][:-3],
2161 '%Y-%m-%d %H:%M:%S.%f')
2162 if key in comments:
2163 message += '\n'
2164 for path, patchsets in sorted(comments.get(key, {}).items()):
2165 if readable:
2166 message += '\n%s' % path
2167 for patchset, lines in sorted(patchsets.items()):
2168 for line, (url, content) in sorted(lines.items()):
2169 if line:
2170 line_str = 'Line %d' % line
2171 path_str = '%s:%d:' % (path, line)
2172 else:
2173 line_str = 'File comment'
2174 path_str = '%s:0:' % path
2175 if readable:
2176 message += '\n %s, %s: %s' % (patchset, line_str, url)
2177 message += '\n %s\n' % content
2178 else:
2179 message += '\n%s ' % path_str
2180 message += '\n%s\n' % content
2181
2182 return _CommentSummary(
2183 date=date,
2184 message=message,
2185 sender=msg['author']['email'],
2186 autogenerated=is_autogenerated,
2187 # These could be inferred from the text messages and correlated with
2188 # Code-Review label maximum, however this is not reliable.
2189 # Leaving as is until the need arises.
2190 approval=False,
2191 disapproval=False,
2192 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002193
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002194 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002195 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002196 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002197
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002198 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002199 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002200 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002201
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002202 def _GetChangeDetail(self, options=None):
2203 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002205 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002206
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002207 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002208 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002209 options.append('CURRENT_COMMIT')
2210
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002211 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002212 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002213 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002214
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002215 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2216 # Assumption: data fetched before with extra options is suitable
2217 # for return for a smaller set of options.
2218 # For example, if we cached data for
2219 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2220 # and request is for options=[CURRENT_REVISION],
2221 # THEN we can return prior cached data.
2222 if options_set.issubset(cached_options_set):
2223 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002224
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002225 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002226 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002227 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002228 except gerrit_util.GerritError as e:
2229 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002230 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002231 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002232
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002233 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002234 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002235
Gavin Mak4e5e3992022-11-14 22:40:12 +00002236 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002237 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002238 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002239 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2240 self._GerritChangeIdentifier(),
2241 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002242 except gerrit_util.GerritError as e:
2243 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002244 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002245 raise
agable32978d92016-11-01 12:55:02 -07002246 return data
2247
Karen Qian40c19422019-03-13 21:28:29 +00002248 def _IsCqConfigured(self):
2249 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002250 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002251
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002252 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002253 if git_common.is_dirty_git_tree('land'):
2254 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002255
tandriid60367b2016-06-22 05:25:12 -07002256 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002257 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002258 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002259 'which can test and land changes for you. '
2260 'Are you sure you wish to bypass it?\n',
2261 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002262 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002263 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002264 # Note: git diff outputs nothing if there is no diff.
2265 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002266 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002267 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002268 if detail['current_revision'] == last_upload:
2269 differs = False
2270 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002271 print('WARNING: Local branch contents differ from latest uploaded '
2272 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002273 if differs:
2274 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002275 confirm_or_exit(
2276 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2277 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002278 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002279 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002280 upstream = self.GetCommonAncestorWithUpstream()
2281 if self.GetIssue():
2282 description = self.FetchDescription()
2283 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002284 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002285 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002286 committing=True,
2287 may_prompt=not force,
2288 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002289 parallel=parallel,
2290 upstream=upstream,
2291 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002292 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002293 resultdb=resultdb,
2294 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002295
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002296 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002297 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002298 links = self._GetChangeCommit().get('web_links', [])
2299 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002300 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002301 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002302 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002303 return 0
2304
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002305 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2306 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002307 assert parsed_issue_arg.valid
2308
Edward Lemur125d60a2019-09-13 18:25:41 +00002309 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002310
2311 if parsed_issue_arg.hostname:
2312 self._gerrit_host = parsed_issue_arg.hostname
2313 self._gerrit_server = 'https://%s' % self._gerrit_host
2314
tandriic2405f52016-10-10 08:13:15 -07002315 try:
2316 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002317 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002318 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002319
2320 if not parsed_issue_arg.patchset:
2321 # Use current revision by default.
2322 revision_info = detail['revisions'][detail['current_revision']]
2323 patchset = int(revision_info['_number'])
2324 else:
2325 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002326 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002327 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2328 break
2329 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002330 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002331 (parsed_issue_arg.patchset, self.GetIssue()))
2332
Edward Lemur125d60a2019-09-13 18:25:41 +00002333 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002334 if remote_url.endswith('.git'):
2335 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002336 remote_url = remote_url.rstrip('/')
2337
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002338 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002339 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002340
2341 if remote_url != fetch_info['url']:
2342 DieWithError('Trying to patch a change from %s but this repo appears '
2343 'to be %s.' % (fetch_info['url'], remote_url))
2344
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002345 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002346
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002347 # If we have created a new branch then do the "set issue" immediately in
2348 # case the cherry-pick fails, which happens when resolving conflicts.
2349 if newbranch:
2350 self.SetIssue(parsed_issue_arg.issue)
2351
Aaron Gable62619a32017-06-16 08:22:09 -07002352 if force:
2353 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2354 print('Checked out commit for change %i patchset %i locally' %
2355 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002356 elif nocommit:
2357 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2358 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002359 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002360 RunGit(['cherry-pick', 'FETCH_HEAD'])
2361 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002362 (parsed_issue_arg.issue, patchset))
2363 print('Note: this created a local commit which does not have '
2364 'the same hash as the one uploaded for review. This will make '
2365 'uploading changes based on top of this branch difficult.\n'
2366 'If you want to do that, use "git cl patch --force" instead.')
2367
Stefan Zagerd08043c2017-10-12 12:07:02 -07002368 if self.GetBranch():
2369 self.SetIssue(parsed_issue_arg.issue)
2370 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002371 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002372 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2373 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002374 else:
2375 print('WARNING: You are in detached HEAD state.\n'
2376 'The patch has been applied to your checkout, but you will not be '
2377 'able to upload a new patch set to the gerrit issue.\n'
2378 'Try using the \'-b\' option if you would like to work on a '
2379 'branch and/or upload a new patch set.')
2380
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002381 return 0
2382
Joanna Wang18de1f62023-01-21 01:24:24 +00002383 @staticmethod
2384 def _GerritCommitMsgHookCheck(offer_removal):
2385 # type: (bool) -> None
2386 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002387 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2388 if not os.path.exists(hook):
2389 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002390 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2391 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002392 data = gclient_utils.FileRead(hook)
2393 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2394 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002395 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002396 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002397 'and may interfere with it in subtle ways.\n'
2398 'We recommend you remove the commit-msg hook.')
2399 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002400 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002401 gclient_utils.rm_file_or_tree(hook)
2402 print('Gerrit commit-msg hook removed.')
2403 else:
2404 print('OK, will keep Gerrit commit-msg hook in place.')
2405
Edward Lemur1b52d872019-05-09 21:12:12 +00002406 def _CleanUpOldTraces(self):
2407 """Keep only the last |MAX_TRACES| traces."""
2408 try:
2409 traces = sorted([
2410 os.path.join(TRACES_DIR, f)
2411 for f in os.listdir(TRACES_DIR)
2412 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2413 and not f.startswith('tmp'))
2414 ])
2415 traces_to_delete = traces[:-MAX_TRACES]
2416 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002417 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002418 except OSError:
2419 print('WARNING: Failed to remove old git traces from\n'
2420 ' %s'
2421 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002422
Edward Lemur5737f022019-05-17 01:24:00 +00002423 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002424 """Zip and write the git push traces stored in traces_dir."""
2425 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002426 traces_zip = trace_name + '-traces'
2427 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002428 # Create a temporary dir to store git config and gitcookies in. It will be
2429 # compressed and stored next to the traces.
2430 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002431 git_info_zip = trace_name + '-git-info'
2432
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002433 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002434
Edward Lemur1b52d872019-05-09 21:12:12 +00002435 git_push_metadata['trace_name'] = trace_name
2436 gclient_utils.FileWrite(
2437 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2438
2439 # Keep only the first 6 characters of the git hashes on the packet
2440 # trace. This greatly decreases size after compression.
2441 packet_traces = os.path.join(traces_dir, 'trace-packet')
2442 if os.path.isfile(packet_traces):
2443 contents = gclient_utils.FileRead(packet_traces)
2444 gclient_utils.FileWrite(
2445 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2446 shutil.make_archive(traces_zip, 'zip', traces_dir)
2447
2448 # Collect and compress the git config and gitcookies.
2449 git_config = RunGit(['config', '-l'])
2450 gclient_utils.FileWrite(
2451 os.path.join(git_info_dir, 'git-config'),
2452 git_config)
2453
2454 cookie_auth = gerrit_util.Authenticator.get()
2455 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2456 gitcookies_path = cookie_auth.get_gitcookies_path()
2457 if os.path.isfile(gitcookies_path):
2458 gitcookies = gclient_utils.FileRead(gitcookies_path)
2459 gclient_utils.FileWrite(
2460 os.path.join(git_info_dir, 'gitcookies'),
2461 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2462 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2463
Edward Lemur1b52d872019-05-09 21:12:12 +00002464 gclient_utils.rmtree(git_info_dir)
2465
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002466 def _RunGitPushWithTraces(self,
2467 refspec,
2468 refspec_opts,
2469 git_push_metadata,
2470 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002471 """Run git push and collect the traces resulting from the execution."""
2472 # Create a temporary directory to store traces in. Traces will be compressed
2473 # and stored in a 'traces' dir inside depot_tools.
2474 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002475 trace_name = os.path.join(
2476 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002477
2478 env = os.environ.copy()
2479 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2480 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002481 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002482 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2483 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2484 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2485
2486 try:
2487 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002488 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002489 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002490 push_cmd = ['git', 'push', remote_url, refspec]
2491 if git_push_options:
2492 for opt in git_push_options:
2493 push_cmd.extend(['-o', opt])
2494
Edward Lemur0f58ae42019-04-30 17:24:12 +00002495 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002496 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002497 env=env,
2498 print_stdout=True,
2499 # Flush after every line: useful for seeing progress when running as
2500 # recipe.
2501 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002502 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002503 except subprocess2.CalledProcessError as e:
2504 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002505 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002506 raise GitPushError(
2507 'Failed to create a change, very likely due to blocked keyword. '
2508 'Please examine output above for the reason of the failure.\n'
2509 'If this is a false positive, you can try to bypass blocked '
2510 'keyword by using push option '
2511 '-o uploadvalidator~skip, e.g.:\n'
2512 'git cl upload -o uploadvalidator~skip\n\n'
2513 'If git-cl is not working correctly, file a bug under the '
2514 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002515 if 'git push -o nokeycheck' in str(e.stdout):
2516 raise GitPushError(
2517 'Failed to create a change, very likely due to a private key being '
2518 'detected. Please examine output above for the reason of the '
2519 'failure.\n'
2520 'If this is a false positive, you can try to bypass private key '
2521 'detection by using push option '
2522 '-o nokeycheck, e.g.:\n'
2523 'git cl upload -o nokeycheck\n\n'
2524 'If git-cl is not working correctly, file a bug under the '
2525 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002526
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002527 raise GitPushError(
2528 'Failed to create a change. Please examine output above for the '
2529 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002530 'For emergencies, Googlers can escalate to '
2531 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002532 'Hint: run command below to diagnose common Git/Gerrit '
2533 'credential problems:\n'
2534 ' git cl creds-check\n'
2535 '\n'
2536 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2537 'component including the files below.\n'
2538 'Review the files before upload, since they might contain sensitive '
2539 'information.\n'
2540 'Set the Restrict-View-Google label so that they are not publicly '
2541 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002542 finally:
2543 execution_time = time_time() - before_push
2544 metrics.collector.add_repeated('sub_commands', {
2545 'command': 'git push',
2546 'execution_time': execution_time,
2547 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002548 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002549 })
2550
Edward Lemur1b52d872019-05-09 21:12:12 +00002551 git_push_metadata['execution_time'] = execution_time
2552 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002553 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002554
Edward Lemur1b52d872019-05-09 21:12:12 +00002555 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002556 gclient_utils.rmtree(traces_dir)
2557
2558 return push_stdout
2559
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002560 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2561 change_desc):
2562 """Upload the current branch to Gerrit, retry if new remote HEAD is
2563 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002564 remote, remote_branch = self.GetRemoteBranch()
2565 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2566
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002567 try:
2568 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002569 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002570 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002571 # Repository might be in the middle of transition to main branch as
2572 # default, and uploads to old default might be blocked.
2573 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002574 DieWithError(str(e), change_desc)
2575
Josip Sokcevicb631a882021-01-06 18:18:10 +00002576 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2577 self.GetGerritProject())
2578 if project_head == branch:
2579 DieWithError(str(e), change_desc)
2580 branch = project_head
2581
2582 print("WARNING: Fetching remote state and retrying upload to default "
2583 "branch...")
2584 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002585 options.edit_description = False
2586 options.force = True
2587 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002588 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2589 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002590 except GitPushError as e:
2591 DieWithError(str(e), change_desc)
2592
2593 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002594 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002595 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002596 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002597 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002598 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002599 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002600 # User requested to change description
2601 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002602 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002603 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2604 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002605 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002606
2607 # Check if changes outside of this workspace have been uploaded.
2608 current_rev = change_detail['current_revision']
2609 last_uploaded_rev = self._GitGetBranchConfigValue(
2610 GERRIT_SQUASH_HASH_CONFIG_KEY)
2611 if last_uploaded_rev and current_rev != last_uploaded_rev:
2612 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002613 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002614 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002615 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002616 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002617 if len(change_ids) == 1:
2618 change_id = change_ids[0]
2619 else:
2620 change_id = GenerateGerritChangeId(change_desc.description)
2621 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002622
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002623 if options.preserve_tryjobs:
2624 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002625
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002626 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002627 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002628 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002629 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002630 with gclient_utils.temporary_file() as desc_tempfile:
2631 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2632 ref_to_push = RunGit(
2633 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002634 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002635 if options.no_add_changeid:
2636 pass
2637 else: # adding Change-Ids is okay.
2638 if not git_footers.get_footer_change_id(change_desc.description):
2639 DownloadGerritHook(False)
2640 change_desc.set_description(
2641 self._AddChangeIdToCommitMessage(change_desc.description,
2642 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002643 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002644 # For no-squash mode, we assume the remote called "origin" is the one we
2645 # want. It is not worthwhile to support different workflows for
2646 # no-squash mode.
2647 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002648 # attempt to extract the changeid from the current description
2649 # fail informatively if not possible.
2650 change_id_candidates = git_footers.get_footer_change_id(
2651 change_desc.description)
2652 if not change_id_candidates:
2653 DieWithError("Unable to extract change-id from message.")
2654 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002655
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002656 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002657 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2658 ref_to_push)]).splitlines()
2659 if len(commits) > 1:
2660 print('WARNING: This will upload %d commits. Run the following command '
2661 'to see which commits will be uploaded: ' % len(commits))
2662 print('git log %s..%s' % (parent, ref_to_push))
2663 print('You can also use `git squash-branch` to squash these into a '
2664 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002665 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002666
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002667 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002668 cc = []
Joanna Wangc8f23e22023-01-19 21:18:10 +00002669 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002670 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2671 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002672 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002673 if len(cc) > 100:
2674 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2675 'process/lsc/lsc_workflow.md')
2676 print('WARNING: This will auto-CC %s users.' % len(cc))
2677 print('LSC may be more appropriate: %s' % lsc)
2678 print('You can also use the --no-autocc flag to disable auto-CC.')
2679 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002680 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002681 if options.cc:
2682 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002683 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002684 if change_desc.get_cced():
2685 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002686 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002687 valid_accounts = set(reviewers + cc)
2688 # TODO(crbug/877717): relax this for all hosts.
2689 else:
2690 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002691 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002692 logging.info('accounts %s are recognized, %s invalid',
2693 sorted(valid_accounts),
2694 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002695
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002696 # Extra options that can be specified at push time. Doc:
2697 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002698 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002699
Aaron Gable844cf292017-06-28 11:32:59 -07002700 # By default, new changes are started in WIP mode, and subsequent patchsets
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002701 # don't send email. At any time, passing --send-mail or --send-email will
2702 # mark the change ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002703 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002704 refspec_opts.append('ready')
2705 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002706 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002707 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002708 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002709 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002710
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002711 # TODO(tandrii): options.message should be posted as a comment if
2712 # --send-mail or --send-email is set on non-initial upload as Rietveld used
2713 # to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002714
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002715 # Set options.title in case user was prompted in _GetTitleForUpload and
2716 # _CMDUploadChange needs to be called again.
2717 options.title = self._GetTitleForUpload(options)
2718 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002719 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002720 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002721 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002722
agablec6787972016-09-09 16:13:34 -07002723 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002724 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002725
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002726 for r in sorted(reviewers):
2727 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002728 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002729 reviewers.remove(r)
2730 else:
2731 # TODO(tandrii): this should probably be a hard failure.
2732 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2733 % r)
2734 for c in sorted(cc):
2735 # refspec option will be rejected if cc doesn't correspond to an
2736 # account, even though REST call to add such arbitrary cc may succeed.
2737 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002738 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002739 cc.remove(c)
2740
rmistry9eadede2016-09-19 11:22:43 -07002741 if options.topic:
2742 # Documentation on Gerrit topics is here:
2743 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002744 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002745
Edward Lemur687ca902018-12-05 02:30:30 +00002746 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002747 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002748 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002749 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002750 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002751 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002752 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002753 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002754 elif options.cq_quick_run:
2755 refspec_opts.append('l=Commit-Queue+1')
2756 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002757
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002758 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002759 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002760 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002761 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002762 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2763
2764 refspec_suffix = ''
2765 if refspec_opts:
2766 refspec_suffix = '%' + ','.join(refspec_opts)
2767 assert ' ' not in refspec_suffix, (
2768 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2769 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002770
Edward Lemur1b52d872019-05-09 21:12:12 +00002771 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002772 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002773 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002774 'change_id': change_id,
2775 'description': change_desc.description,
2776 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002777
Gavin Mak4e5e3992022-11-14 22:40:12 +00002778 # Gerrit may or may not update fast enough to return the correct patchset
2779 # number after we push. Get the pre-upload patchset and increment later.
2780 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2781
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002782 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002783 git_push_metadata,
2784 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002785
2786 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002787 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002788 change_numbers = [m.group(1)
2789 for m in map(regex.match, push_stdout.splitlines())
2790 if m]
2791 if len(change_numbers) != 1:
2792 DieWithError(
2793 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002794 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002796 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002797 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002798
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002799 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002800 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002801 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002802 gerrit_util.AddReviewers(self.GetGerritHost(),
2803 self._GerritChangeIdentifier(),
2804 reviewers,
2805 cc,
2806 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002807
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002808 return 0
2809
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002810 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2811 change_desc):
2812 """Computes parent of the generated commit to be uploaded to Gerrit.
2813
2814 Returns revision or a ref name.
2815 """
2816 if custom_cl_base:
2817 # Try to avoid creating additional unintended CLs when uploading, unless
2818 # user wants to take this risk.
2819 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2820 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2821 local_ref_of_target_remote])
2822 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002823 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002824 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2825 'If you proceed with upload, more than 1 CL may be created by '
2826 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2827 'If you are certain that specified base `%s` has already been '
2828 'uploaded to Gerrit as another CL, you may proceed.\n' %
2829 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2830 if not force:
2831 confirm_or_exit(
2832 'Do you take responsibility for cleaning up potential mess '
2833 'resulting from proceeding with upload?',
2834 action='upload')
2835 return custom_cl_base
2836
Aaron Gablef97e33d2017-03-30 15:44:27 -07002837 if remote != '.':
2838 return self.GetCommonAncestorWithUpstream()
2839
2840 # If our upstream branch is local, we base our squashed commit on its
2841 # squashed version.
2842 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2843
Aaron Gablef97e33d2017-03-30 15:44:27 -07002844 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002845 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002846 if upstream_branch_name == 'main':
2847 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002848
2849 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002850 # TODO(tandrii): consider checking parent change in Gerrit and using its
2851 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2852 # the tree hash of the parent branch. The upside is less likely bogus
2853 # requests to reupload parent change just because it's uploadhash is
2854 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002855 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2856 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002857 # Verify that the upstream branch has been uploaded too, otherwise
2858 # Gerrit will create additional CLs when uploading.
2859 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2860 RunGitSilent(['rev-parse', parent + ':'])):
2861 DieWithError(
2862 '\nUpload upstream branch %s first.\n'
2863 'It is likely that this branch has been rebased since its last '
2864 'upload, so you just need to upload it again.\n'
2865 '(If you uploaded it with --no-squash, then branch dependencies '
2866 'are not supported, and you should reupload with --squash.)'
2867 % upstream_branch_name,
2868 change_desc)
2869 return parent
2870
Gavin Mak4e5e3992022-11-14 22:40:12 +00002871 def _UpdateWithExternalChanges(self):
2872 """Updates workspace with external changes.
2873
2874 Returns the commit hash that should be used as the merge base on upload.
2875 """
2876 local_ps = self.GetPatchset()
2877 if local_ps is None:
2878 return
2879
2880 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002881 if external_ps is None or local_ps == external_ps or \
2882 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002883 return
2884
2885 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002886 if num_changes > 1:
2887 change_words = 'changes were'
2888 else:
2889 change_words = 'change was'
2890 print('\n%d external %s published to %s:\n' %
2891 (num_changes, change_words, self.GetIssueURL(short=True)))
2892
2893 # Print an overview of external changes.
2894 ps_to_commit = {}
2895 ps_to_info = {}
2896 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2897 for commit_id, revision_info in revisions.get('revisions', {}).items():
2898 ps_num = revision_info['_number']
2899 ps_to_commit[ps_num] = commit_id
2900 ps_to_info[ps_num] = revision_info
2901
2902 for ps in range(external_ps, local_ps, -1):
2903 commit = ps_to_commit[ps][:8]
2904 desc = ps_to_info[ps].get('description', '')
2905 print('Patchset %d [%s] %s' % (ps, commit, desc))
2906
2907 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2908 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002909 return
2910
2911 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2912 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2913 external_base = external_parent['commit']
2914
2915 branch = git_common.current_branch()
2916 local_base = self.GetCommonAncestorWithUpstream()
2917 if local_base != external_base:
2918 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2919 (local_base, external_base))
2920 if git_common.upstream(branch):
2921 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2922 'to make these the same.')
2923 print('No upstream branch set. Consider setting it and using '
2924 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2925
2926 # Fetch Gerrit's CL base if it doesn't exist locally.
2927 remote, _ = self.GetRemoteBranch()
2928 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2929 RunGitSilent(['fetch', remote, external_base])
2930
2931 # Get the diff between local_ps and external_ps.
2932 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002933 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002934 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
2935 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2936 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
2937 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2938 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
2939
2940 # Diff can be empty in the case of trivial rebases.
2941 if not diff:
2942 return external_base
2943
2944 # Apply the diff.
2945 with gclient_utils.temporary_file() as diff_tempfile:
2946 gclient_utils.FileWrite(diff_tempfile, diff)
2947 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
2948 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
2949 if not clean_patch:
2950 # Normally patchset is set after upload. But because we exit, that never
2951 # happens. Updating here makes sure that subsequent uploads don't need
2952 # to fetch/apply the same diff again.
2953 self.SetPatchset(external_ps)
2954 DieWithError('\nPatch did not apply cleanly. Please resolve any '
2955 'conflicts and reupload.')
2956
2957 message = 'Incorporate external changes from '
2958 if num_changes == 1:
2959 message += 'patchset %d' % external_ps
2960 else:
2961 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
2962 RunGitSilent(['commit', '-am', message])
2963 # TODO(crbug.com/1382528): Use the previous commit's message as a default
2964 # patchset title instead of this 'Incorporate' message.
2965 return external_base
2966
Edward Lemura12175c2020-03-09 16:58:26 +00002967 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002968 """Re-commits using the current message, assumes the commit hook is in
2969 place.
2970 """
Edward Lemura12175c2020-03-09 16:58:26 +00002971 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002972 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002973 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002974 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002975 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002976
2977 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002978
tandriie113dfd2016-10-11 10:20:12 -07002979 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002980 try:
2981 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002982 except GerritChangeNotExists:
2983 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002984
2985 if data['status'] in ('ABANDONED', 'MERGED'):
2986 return 'CL %s is closed' % self.GetIssue()
2987
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002988 def GetGerritChange(self, patchset=None):
2989 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002990 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002991 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002992 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002993 data = self._GetChangeDetail(['ALL_REVISIONS'])
2994
2995 assert host and issue and patchset, 'CL must be uploaded first'
2996
2997 has_patchset = any(
2998 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002999 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003000 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003001 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003002 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003003
tandrii8c5a3532016-11-04 07:52:02 -07003004 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003005 'host': host,
3006 'change': issue,
3007 'project': data['project'],
3008 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003009 }
tandriie113dfd2016-10-11 10:20:12 -07003010
tandriide281ae2016-10-12 06:02:30 -07003011 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003012 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003013
Edward Lemur707d70b2018-02-07 00:50:14 +01003014 def GetReviewers(self):
3015 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003016 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003017
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003018
Lei Zhang8a0efc12020-08-05 19:58:45 +00003019def _get_bug_line_values(default_project_prefix, bugs):
3020 """Given default_project_prefix and comma separated list of bugs, yields bug
3021 line values.
tandriif9aefb72016-07-01 09:06:51 -07003022
3023 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003024 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003025 * string, which is left as is.
3026
3027 This function may produce more than one line, because bugdroid expects one
3028 project per line.
3029
Lei Zhang8a0efc12020-08-05 19:58:45 +00003030 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003031 ['v8:123', 'chromium:789']
3032 """
3033 default_bugs = []
3034 others = []
3035 for bug in bugs.split(','):
3036 bug = bug.strip()
3037 if bug:
3038 try:
3039 default_bugs.append(int(bug))
3040 except ValueError:
3041 others.append(bug)
3042
3043 if default_bugs:
3044 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003045 if default_project_prefix:
3046 if not default_project_prefix.endswith(':'):
3047 default_project_prefix += ':'
3048 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003049 else:
3050 yield default_bugs
3051 for other in sorted(others):
3052 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3053 yield other
3054
3055
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003056class ChangeDescription(object):
3057 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003058 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003059 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003060 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003061 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003062 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003063 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3064 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003065 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003066 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003067
Dan Beamd8b04ca2019-10-10 21:23:26 +00003068 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003069 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003070 if bug:
3071 regexp = re.compile(self.BUG_LINE)
3072 prefix = settings.GetBugPrefix()
3073 if not any((regexp.match(line) for line in self._description_lines)):
3074 values = list(_get_bug_line_values(prefix, bug))
3075 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003076 if fixed:
3077 regexp = re.compile(self.FIXED_LINE)
3078 prefix = settings.GetBugPrefix()
3079 if not any((regexp.match(line) for line in self._description_lines)):
3080 values = list(_get_bug_line_values(prefix, fixed))
3081 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003082
agable@chromium.org42c20792013-09-12 17:34:49 +00003083 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003084 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003085 return '\n'.join(self._description_lines)
3086
3087 def set_description(self, desc):
3088 if isinstance(desc, basestring):
3089 lines = desc.splitlines()
3090 else:
3091 lines = [line.rstrip() for line in desc]
3092 while lines and not lines[0]:
3093 lines.pop(0)
3094 while lines and not lines[-1]:
3095 lines.pop(-1)
3096 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003097
Edward Lemur5a644f82020-03-18 16:44:57 +00003098 def ensure_change_id(self, change_id):
3099 description = self.description
3100 footer_change_ids = git_footers.get_footer_change_id(description)
3101 # Make sure that the Change-Id in the description matches the given one.
3102 if footer_change_ids != [change_id]:
3103 if footer_change_ids:
3104 # Remove any existing Change-Id footers since they don't match the
3105 # expected change_id footer.
3106 description = git_footers.remove_footer(description, 'Change-Id')
3107 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3108 'if you want to set a new one.')
3109 # Add the expected Change-Id footer.
3110 description = git_footers.add_footer_change_id(description, change_id)
3111 self.set_description(description)
3112
Joanna Wang39811b12023-01-20 23:09:48 +00003113 def update_reviewers(self, reviewers):
3114 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003115
3116 Args:
3117 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003118 """
Joanna Wang39811b12023-01-20 23:09:48 +00003119 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003120 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003121
3122 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003123
Joanna Wang39811b12023-01-20 23:09:48 +00003124 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003125 regexp = re.compile(self.R_LINE)
3126 matches = [regexp.match(line) for line in self._description_lines]
3127 new_desc = [l for i, l in enumerate(self._description_lines)
3128 if not matches[i]]
3129 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003130
Joanna Wang39811b12023-01-20 23:09:48 +00003131 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003132
Joanna Wang39811b12023-01-20 23:09:48 +00003133 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003134 for match in matches:
3135 if not match:
3136 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003137 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003138
Joanna Wang39811b12023-01-20 23:09:48 +00003139 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003140
3141 # Put the new lines in the description where the old first R= line was.
3142 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3143 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003144 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003145 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003146 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003147
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003148 def set_preserve_tryjobs(self):
3149 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3150 footers = git_footers.parse_footers(self.description)
3151 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3152 if v.lower() == 'true':
3153 return
3154 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3155
Anthony Polito8b955342019-09-24 19:01:36 +00003156 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003157 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003158 self.set_description([
3159 '# Enter a description of the change.',
3160 '# This will be displayed on the codereview site.',
3161 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003162 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003163 '--------------------',
3164 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003165 bug_regexp = re.compile(self.BUG_LINE)
3166 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003167 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003168 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003169
Dan Beamd8b04ca2019-10-10 21:23:26 +00003170 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003171 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003172
Bruce Dawsonfc487042020-10-27 19:11:37 +00003173 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003174 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003175 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003176 if not content:
3177 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003178 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003179
Bruce Dawson2377b012018-01-11 16:46:49 -08003180 # Strip off comments and default inserted "Bug:" line.
3181 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003182 (line.startswith('#') or
3183 line.rstrip() == "Bug:" or
3184 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003185 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003186 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003187 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003188
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003189 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003190 """Adds a footer line to the description.
3191
3192 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3193 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3194 that Gerrit footers are always at the end.
3195 """
3196 parsed_footer_line = git_footers.parse_footer(line)
3197 if parsed_footer_line:
3198 # Line is a gerrit footer in the form: Footer-Key: any value.
3199 # Thus, must be appended observing Gerrit footer rules.
3200 self.set_description(
3201 git_footers.add_footer(self.description,
3202 key=parsed_footer_line[0],
3203 value=parsed_footer_line[1]))
3204 return
3205
3206 if not self._description_lines:
3207 self._description_lines.append(line)
3208 return
3209
3210 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3211 if gerrit_footers:
3212 # git_footers.split_footers ensures that there is an empty line before
3213 # actual (gerrit) footers, if any. We have to keep it that way.
3214 assert top_lines and top_lines[-1] == ''
3215 top_lines, separator = top_lines[:-1], top_lines[-1:]
3216 else:
3217 separator = [] # No need for separator if there are no gerrit_footers.
3218
3219 prev_line = top_lines[-1] if top_lines else ''
3220 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3221 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3222 top_lines.append('')
3223 top_lines.append(line)
3224 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003225
tandrii99a72f22016-08-17 14:33:24 -07003226 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003227 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003228 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003229 reviewers = [match.group(2).strip()
3230 for match in matches
3231 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003233
bradnelsond975b302016-10-23 12:20:23 -07003234 def get_cced(self):
3235 """Retrieves the list of reviewers."""
3236 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3237 cced = [match.group(2).strip() for match in matches if match]
3238 return cleanup_list(cced)
3239
Nodir Turakulov23b82142017-11-16 11:04:25 -08003240 def get_hash_tags(self):
3241 """Extracts and sanitizes a list of Gerrit hashtags."""
3242 subject = (self._description_lines or ('',))[0]
3243 subject = re.sub(
3244 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3245
3246 tags = []
3247 start = 0
3248 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3249 while True:
3250 m = bracket_exp.match(subject, start)
3251 if not m:
3252 break
3253 tags.append(self.sanitize_hash_tag(m.group(1)))
3254 start = m.end()
3255
3256 if not tags:
3257 # Try "Tag: " prefix.
3258 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3259 if m:
3260 tags.append(self.sanitize_hash_tag(m.group(1)))
3261 return tags
3262
3263 @classmethod
3264 def sanitize_hash_tag(cls, tag):
3265 """Returns a sanitized Gerrit hash tag.
3266
3267 A sanitized hashtag can be used as a git push refspec parameter value.
3268 """
3269 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3270
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003271
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003272def FindCodereviewSettingsFile(filename='codereview.settings'):
3273 """Finds the given file starting in the cwd and going up.
3274
3275 Only looks up to the top of the repository unless an
3276 'inherit-review-settings-ok' file exists in the root of the repository.
3277 """
3278 inherit_ok_file = 'inherit-review-settings-ok'
3279 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003280 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003281 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003282 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003283 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003284 if os.path.isfile(os.path.join(cwd, filename)):
3285 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003286 if cwd == root:
3287 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003288 parent_dir = os.path.dirname(cwd)
3289 if parent_dir == cwd:
3290 # We hit the system root directory.
3291 break
3292 cwd = parent_dir
3293 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003294
3295
3296def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003297 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003298 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003299
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003300 def SetProperty(name, setting, unset_error_ok=False):
3301 fullname = 'rietveld.' + name
3302 if setting in keyvals:
3303 RunGit(['config', fullname, keyvals[setting]])
3304 else:
3305 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3306
tandrii48df5812016-10-17 03:55:37 -07003307 if not keyvals.get('GERRIT_HOST', False):
3308 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003309 # Only server setting is required. Other settings can be absent.
3310 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003311 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003312 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3313 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003314 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003315 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3316 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003317 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3318 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003319 SetProperty(
3320 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003321 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003322
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003323 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003324 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003325
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003326 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003327 RunGit(['config', 'gerrit.squash-uploads',
3328 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003329
tandrii@chromium.org28253532016-04-14 13:46:56 +00003330 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003331 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003332 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3333
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003334 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003335 # should be of the form
3336 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3337 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003338 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3339 keyvals['ORIGIN_URL_CONFIG']])
3340
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003341
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003342def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003343 """Downloads a network object to a local file, like urllib.urlretrieve.
3344
3345 This is necessary because urllib is broken for SSL connections via a proxy.
3346 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003347 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003348 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003349
3350
ukai@chromium.org712d6102013-11-27 00:52:58 +00003351def hasSheBang(fname):
3352 """Checks fname is a #! script."""
3353 with open(fname) as f:
3354 return f.read(2).startswith('#!')
3355
3356
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003357def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003358 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003359
3360 Args:
3361 force: True to update hooks. False to install hooks if not present.
3362 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003363 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003364 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3365 if not os.access(dst, os.X_OK):
3366 if os.path.exists(dst):
3367 if not force:
3368 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003369 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003370 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003371 if not hasSheBang(dst):
3372 DieWithError('Not a script: %s\n'
3373 'You need to download from\n%s\n'
3374 'into .git/hooks/commit-msg and '
3375 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003376 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3377 except Exception:
3378 if os.path.exists(dst):
3379 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003380 DieWithError('\nFailed to download hooks.\n'
3381 'You need to download from\n%s\n'
3382 'into .git/hooks/commit-msg and '
3383 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003384
3385
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003386class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003387 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003388
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003389 def __init__(self):
3390 # Cached list of [host, identity, source], where source is either
3391 # .gitcookies or .netrc.
3392 self._all_hosts = None
3393
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003394 def ensure_configured_gitcookies(self):
3395 """Runs checks and suggests fixes to make git use .gitcookies from default
3396 path."""
3397 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3398 configured_path = RunGitSilent(
3399 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003400 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003401 if configured_path:
3402 self._ensure_default_gitcookies_path(configured_path, default)
3403 else:
3404 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003405
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003406 @staticmethod
3407 def _ensure_default_gitcookies_path(configured_path, default_path):
3408 assert configured_path
3409 if configured_path == default_path:
3410 print('git is already configured to use your .gitcookies from %s' %
3411 configured_path)
3412 return
3413
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003414 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003415 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3416 (configured_path, default_path))
3417
3418 if not os.path.exists(configured_path):
3419 print('However, your configured .gitcookies file is missing.')
3420 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3421 action='reconfigure')
3422 RunGit(['config', '--global', 'http.cookiefile', default_path])
3423 return
3424
3425 if os.path.exists(default_path):
3426 print('WARNING: default .gitcookies file already exists %s' %
3427 default_path)
3428 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3429 default_path)
3430
3431 confirm_or_exit('Move existing .gitcookies to default location?',
3432 action='move')
3433 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003434 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003435 print('Moved and reconfigured git to use .gitcookies from %s' %
3436 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003437
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003438 @staticmethod
3439 def _configure_gitcookies_path(default_path):
3440 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3441 if os.path.exists(netrc_path):
3442 print('You seem to be using outdated .netrc for git credentials: %s' %
3443 netrc_path)
3444 print('This tool will guide you through setting up recommended '
3445 '.gitcookies store for git credentials.\n'
3446 '\n'
3447 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3448 ' git config --global --unset http.cookiefile\n'
3449 ' mv %s %s.backup\n\n' % (default_path, default_path))
3450 confirm_or_exit(action='setup .gitcookies')
3451 RunGit(['config', '--global', 'http.cookiefile', default_path])
3452 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003453
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003454 def get_hosts_with_creds(self, include_netrc=False):
3455 if self._all_hosts is None:
3456 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003457 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3458 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3459 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3460 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003461
3462 if include_netrc:
3463 return self._all_hosts
3464 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3465
3466 def print_current_creds(self, include_netrc=False):
3467 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3468 if not hosts:
3469 print('No Git/Gerrit credentials found')
3470 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003471 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003472 header = [('Host', 'User', 'Which file'),
3473 ['=' * l for l in lengths]]
3474 for row in (header + hosts):
3475 print('\t'.join((('%%+%ds' % l) % s)
3476 for l, s in zip(lengths, row)))
3477
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003478 @staticmethod
3479 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003480 """Parses identity "git-<username>.domain" into <username> and domain."""
3481 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003482 # distinguishable from sub-domains. But we do know typical domains:
3483 if identity.endswith('.chromium.org'):
3484 domain = 'chromium.org'
3485 username = identity[:-len('.chromium.org')]
3486 else:
3487 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003488 if username.startswith('git-'):
3489 username = username[len('git-'):]
3490 return username, domain
3491
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003492 def has_generic_host(self):
3493 """Returns whether generic .googlesource.com has been configured.
3494
3495 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3496 """
3497 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003498 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003499 return True
3500 return False
3501
3502 def _get_git_gerrit_identity_pairs(self):
3503 """Returns map from canonic host to pair of identities (Git, Gerrit).
3504
3505 One of identities might be None, meaning not configured.
3506 """
3507 host_to_identity_pairs = {}
3508 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003509 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003510 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3511 idx = 0 if canonical == host else 1
3512 pair[idx] = identity
3513 return host_to_identity_pairs
3514
3515 def get_partially_configured_hosts(self):
3516 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003517 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003518 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003519 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003520
3521 def get_conflicting_hosts(self):
3522 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003523 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003524 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003525 if None not in (i1, i2) and i1 != i2)
3526
3527 def get_duplicated_hosts(self):
3528 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003529 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003530
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003531
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003532 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003533 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003534 hosts = sorted(hosts)
3535 assert hosts
3536 if extra_column_func is None:
3537 extras = [''] * len(hosts)
3538 else:
3539 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003540 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3541 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003542 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003543 lines.append(tmpl % he)
3544 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003545
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003546 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003547 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003548 yield ('.googlesource.com wildcard record detected',
3549 ['Chrome Infrastructure team recommends to list full host names '
3550 'explicitly.'],
3551 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003552
3553 dups = self.get_duplicated_hosts()
3554 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003555 yield ('The following hosts were defined twice',
3556 self._format_hosts(dups),
3557 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003558
3559 partial = self.get_partially_configured_hosts()
3560 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003561 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3562 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003563 self._format_hosts(
3564 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3565 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003566
3567 conflicting = self.get_conflicting_hosts()
3568 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003569 yield ('The following Git hosts have differing credentials from their '
3570 'Gerrit counterparts',
3571 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3572 tuple(self._get_git_gerrit_identity_pairs()[host])),
3573 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003574
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003575 def find_and_report_problems(self):
3576 """Returns True if there was at least one problem, else False."""
3577 found = False
3578 bad_hosts = set()
3579 for title, sublines, hosts in self._find_problems():
3580 if not found:
3581 found = True
3582 print('\n\n.gitcookies problem report:\n')
3583 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003584 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003585 if sublines:
3586 print()
3587 print(' %s' % '\n '.join(sublines))
3588 print()
3589
3590 if bad_hosts:
3591 assert found
3592 print(' You can manually remove corresponding lines in your %s file and '
3593 'visit the following URLs with correct account to generate '
3594 'correct credential lines:\n' %
3595 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003596 print(' %s' % '\n '.join(
3597 sorted(
3598 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3599 _canonical_git_googlesource_host(host))
3600 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003601 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003602
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003603
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003604@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003605def CMDcreds_check(parser, args):
3606 """Checks credentials and suggests changes."""
3607 _, _ = parser.parse_args(args)
3608
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003609 # Code below checks .gitcookies. Abort if using something else.
3610 authn = gerrit_util.Authenticator.get()
3611 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003612 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003613 'This command is not designed for bot environment. It checks '
3614 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003615 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3616 if isinstance(authn, gerrit_util.GceAuthenticator):
3617 message += (
3618 '\n'
3619 'If you need to run this on GCE or a cloudtop instance, '
3620 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3621 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003622
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003623 checker = _GitCookiesChecker()
3624 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003625
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003626 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003627 checker.print_current_creds(include_netrc=True)
3628
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003629 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003630 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003631 return 0
3632 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003633
3634
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003635@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003636def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003637 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003638 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003639 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003640 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003641 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003642 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003643 return RunGit(['config', 'branch.%s.base-url' % branch],
3644 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003645
3646 print('Setting base-url to %s' % args[0])
3647 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3648 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003649
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003650
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003651def color_for_status(status):
3652 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003653 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003654 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003655 'unsent': BOLD + Fore.YELLOW,
3656 'waiting': BOLD + Fore.RED,
3657 'reply': BOLD + Fore.YELLOW,
3658 'not lgtm': BOLD + Fore.RED,
3659 'lgtm': BOLD + Fore.GREEN,
3660 'commit': BOLD + Fore.MAGENTA,
3661 'closed': BOLD + Fore.CYAN,
3662 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003663 }.get(status, Fore.WHITE)
3664
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003665
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003666def get_cl_statuses(changes, fine_grained, max_processes=None):
3667 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003668
3669 If fine_grained is true, this will fetch CL statuses from the server.
3670 Otherwise, simply indicate if there's a matching url for the given branches.
3671
3672 If max_processes is specified, it is used as the maximum number of processes
3673 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3674 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003675
3676 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003677 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003678 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003679 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003680
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003681 if not fine_grained:
3682 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003683 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003684 for cl in changes:
3685 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003686 return
3687
3688 # First, sort out authentication issues.
3689 logging.debug('ensuring credentials exist')
3690 for cl in changes:
3691 cl.EnsureAuthenticated(force=False, refresh=True)
3692
3693 def fetch(cl):
3694 try:
3695 return (cl, cl.GetStatus())
3696 except:
3697 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003698 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003699 raise
3700
3701 threads_count = len(changes)
3702 if max_processes:
3703 threads_count = max(1, min(threads_count, max_processes))
3704 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3705
Edward Lemur61bf4172020-02-24 23:22:37 +00003706 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003707 fetched_cls = set()
3708 try:
3709 it = pool.imap_unordered(fetch, changes).__iter__()
3710 while True:
3711 try:
3712 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003713 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003714 break
3715 fetched_cls.add(cl)
3716 yield cl, status
3717 finally:
3718 pool.close()
3719
3720 # Add any branches that failed to fetch.
3721 for cl in set(changes) - fetched_cls:
3722 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003723
rmistry@google.com2dd99862015-06-22 12:22:18 +00003724
Jose Lopes3863fc52020-04-07 17:00:25 +00003725def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003726 """Uploads CLs of local branches that are dependents of the current branch.
3727
3728 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003729
3730 test1 -> test2.1 -> test3.1
3731 -> test3.2
3732 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003733
3734 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3735 run on the dependent branches in this order:
3736 test2.1, test3.1, test3.2, test2.2, test3.3
3737
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003738 Note: This function does not rebase your local dependent branches. Use it
3739 when you make a change to the parent branch that will not conflict
3740 with its dependent branches, and you would like their dependencies
3741 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003742 """
3743 if git_common.is_dirty_git_tree('upload-branch-deps'):
3744 return 1
3745
3746 root_branch = cl.GetBranch()
3747 if root_branch is None:
3748 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3749 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003750 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003751 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3752 'patchset dependencies without an uploaded CL.')
3753
3754 branches = RunGit(['for-each-ref',
3755 '--format=%(refname:short) %(upstream:short)',
3756 'refs/heads'])
3757 if not branches:
3758 print('No local branches found.')
3759 return 0
3760
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003761 # Create a dictionary of all local branches to the branches that are
3762 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003763 tracked_to_dependents = collections.defaultdict(list)
3764 for b in branches.splitlines():
3765 tokens = b.split()
3766 if len(tokens) == 2:
3767 branch_name, tracked = tokens
3768 tracked_to_dependents[tracked].append(branch_name)
3769
vapiera7fbd5a2016-06-16 09:17:49 -07003770 print()
3771 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003772 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003773
rmistry@google.com2dd99862015-06-22 12:22:18 +00003774 def traverse_dependents_preorder(branch, padding=''):
3775 dependents_to_process = tracked_to_dependents.get(branch, [])
3776 padding += ' '
3777 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003778 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003779 dependents.append(dependent)
3780 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003781
rmistry@google.com2dd99862015-06-22 12:22:18 +00003782 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003784
3785 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003786 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003787 return 0
3788
Jose Lopes3863fc52020-04-07 17:00:25 +00003789 if not force:
3790 confirm_or_exit('This command will checkout all dependent branches and run '
3791 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003792
rmistry@google.com2dd99862015-06-22 12:22:18 +00003793 # Record all dependents that failed to upload.
3794 failures = {}
3795 # Go through all dependents, checkout the branch and upload.
3796 try:
3797 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003798 print()
3799 print('--------------------------------------')
3800 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003801 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003803 try:
3804 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003805 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003806 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003807 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003808 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003810 finally:
3811 # Swap back to the original root branch.
3812 RunGit(['checkout', '-q', root_branch])
3813
vapiera7fbd5a2016-06-16 09:17:49 -07003814 print()
3815 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003816 for dependent_branch in dependents:
3817 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003818 print(' %s : %s' % (dependent_branch, upload_status))
3819 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003820
3821 return 0
3822
3823
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003824def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003825 """Given a proposed tag name, returns a tag name that is guaranteed to be
3826 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3827 or 'foo-3', and so on."""
3828
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003829 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003830 for suffix_num in itertools.count(1):
3831 if suffix_num == 1:
3832 to_check = proposed_tag
3833 else:
3834 to_check = '%s-%d' % (proposed_tag, suffix_num)
3835
3836 if to_check not in existing_tags:
3837 return to_check
3838
3839
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003840@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003841def CMDarchive(parser, args):
3842 """Archives and deletes branches associated with closed changelists."""
3843 parser.add_option(
3844 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003845 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003846 parser.add_option(
3847 '-f', '--force', action='store_true',
3848 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003849 parser.add_option(
3850 '-d', '--dry-run', action='store_true',
3851 help='Skip the branch tagging and removal steps.')
3852 parser.add_option(
3853 '-t', '--notags', action='store_true',
3854 help='Do not tag archived branches. '
3855 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003856 parser.add_option(
3857 '-p',
3858 '--pattern',
3859 default='git-cl-archived-{issue}-{branch}',
3860 help='Format string for archive tags. '
3861 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003862
kmarshall3bff56b2016-06-06 18:31:47 -07003863 options, args = parser.parse_args(args)
3864 if args:
3865 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003866
3867 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3868 if not branches:
3869 return 0
3870
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003871 tags = RunGit(['for-each-ref', '--format=%(refname)',
3872 'refs/tags']).splitlines() or []
3873 tags = [t.split('/')[-1] for t in tags]
3874
vapiera7fbd5a2016-06-16 09:17:49 -07003875 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003876 changes = [Changelist(branchref=b)
3877 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003878 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3879 statuses = get_cl_statuses(changes,
3880 fine_grained=True,
3881 max_processes=options.maxjobs)
3882 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003883 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3884 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003885 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003886 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003887 proposal.sort()
3888
3889 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003890 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003891 return 0
3892
Edward Lemur85153282020-02-14 22:06:29 +00003893 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003894
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003896 if options.notags:
3897 for next_item in proposal:
3898 print(' ' + next_item[0])
3899 else:
3900 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3901 for next_item in proposal:
3902 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003903
kmarshall9249e012016-08-23 12:02:16 -07003904 # Quit now on precondition failure or if instructed by the user, either
3905 # via an interactive prompt or by command line flags.
3906 if options.dry_run:
3907 print('\nNo changes were made (dry run).\n')
3908 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003909
3910 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003911 print('You are currently on a branch \'%s\' which is associated with a '
3912 'closed codereview issue, so archive cannot proceed. Please '
3913 'checkout another branch and run this command again.' %
3914 current_branch)
3915 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003916
3917 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003918 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003919 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003920 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003921 return 1
3922
3923 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003924 if not options.notags:
3925 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003926
3927 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3928 # Clean up the tag if we failed to delete the branch.
3929 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003930
vapiera7fbd5a2016-06-16 09:17:49 -07003931 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003932
3933 return 0
3934
3935
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003936@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003937def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003938 """Show status of changelists.
3939
3940 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003941 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003942 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003943 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003944 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003945 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003946 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003947 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003948
3949 Also see 'git cl comments'.
3950 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003951 parser.add_option(
3952 '--no-branch-color',
3953 action='store_true',
3954 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003955 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003956 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003957 parser.add_option('-f', '--fast', action='store_true',
3958 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003959 parser.add_option(
3960 '-j', '--maxjobs', action='store', type=int,
3961 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003962 parser.add_option(
3963 '-i', '--issue', type=int,
3964 help='Operate on this issue instead of the current branch\'s implicit '
3965 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003966 parser.add_option('-d',
3967 '--date-order',
3968 action='store_true',
3969 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003970 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003971 if args:
3972 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003973
iannuccie53c9352016-08-17 14:40:40 -07003974 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003975 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003976
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003977 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003978 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003979 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003980 if cl.GetIssue():
3981 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003982 elif options.field == 'id':
3983 issueid = cl.GetIssue()
3984 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003985 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003986 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003987 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003988 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003990 elif options.field == 'status':
3991 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003992 elif options.field == 'url':
3993 url = cl.GetIssueURL()
3994 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003995 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003996 return 0
3997
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003998 branches = RunGit([
3999 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4000 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004001 if not branches:
4002 print('No local branch found.')
4003 return 0
4004
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004005 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004006 Changelist(branchref=b, commit_date=ct)
4007 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4008 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004009 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004010 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004011 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004012 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004013
Edward Lemur85153282020-02-14 22:06:29 +00004014 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004015
4016 def FormatBranchName(branch, colorize=False):
4017 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4018 an asterisk when it is the current branch."""
4019
4020 asterisk = ""
4021 color = Fore.RESET
4022 if branch == current_branch:
4023 asterisk = "* "
4024 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004025 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004026
4027 if colorize:
4028 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004029 return asterisk + branch_name
4030
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004031 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004032
4033 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004034
4035 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004036 sorted_changes = sorted(changes,
4037 key=lambda c: c.GetCommitDate(),
4038 reverse=True)
4039 else:
4040 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4041 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004042 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004043 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004044 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004045 branch_statuses[c.GetBranch()] = status
4046 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004047 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004048 if url and (not status or status == 'error'):
4049 # The issue probably doesn't exist anymore.
4050 url += ' (broken)'
4051
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004052 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004053 # Turn off bold as well as colors.
4054 END = '\033[0m'
4055 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004056 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004057 color = ''
4058 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004059 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004060
Alan Cuttera3be9a52019-03-04 18:50:33 +00004061 branch_display = FormatBranchName(branch)
4062 padding = ' ' * (alignment - len(branch_display))
4063 if not options.no_branch_color:
4064 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004065
Alan Cuttera3be9a52019-03-04 18:50:33 +00004066 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4067 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004068
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004070 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004071 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004072 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004073 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004074 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004076 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004078 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004080 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004081 return 0
4082
4083
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004084def colorize_CMDstatus_doc():
4085 """To be called once in main() to add colors to git cl status help."""
4086 colors = [i for i in dir(Fore) if i[0].isupper()]
4087
4088 def colorize_line(line):
4089 for color in colors:
4090 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004091 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004092 indent = len(line) - len(line.lstrip(' ')) + 1
4093 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4094 return line
4095
4096 lines = CMDstatus.__doc__.splitlines()
4097 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4098
4099
phajdan.jre328cf92016-08-22 04:12:17 -07004100def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004101 if path == '-':
4102 json.dump(contents, sys.stdout)
4103 else:
4104 with open(path, 'w') as f:
4105 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004106
4107
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004108@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004109@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004110def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004111 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004112
4113 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004114 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004115 parser.add_option('-r', '--reverse', action='store_true',
4116 help='Lookup the branch(es) for the specified issues. If '
4117 'no issues are specified, all branches with mapped '
4118 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004119 parser.add_option('--json',
4120 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004121 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004122
dnj@chromium.org406c4402015-03-03 17:22:28 +00004123 if options.reverse:
4124 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004125 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004126 # Reverse issue lookup.
4127 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004128
4129 git_config = {}
4130 for config in RunGit(['config', '--get-regexp',
4131 r'branch\..*issue']).splitlines():
4132 name, _space, val = config.partition(' ')
4133 git_config[name] = val
4134
dnj@chromium.org406c4402015-03-03 17:22:28 +00004135 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004136 issue = git_config.get(
4137 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004138 if issue:
4139 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004140 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004141 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004142 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004143 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004144 try:
4145 issue_num = int(issue)
4146 except ValueError:
4147 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004148 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004149 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004151 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004152 if options.json:
4153 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004154 return 0
4155
4156 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004157 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004158 if not issue.valid:
4159 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4160 'or no argument to list it.\n'
4161 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004162 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004163 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004164 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004165 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004166 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4167 if options.json:
4168 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004169 'gerrit_host': cl.GetGerritHost(),
4170 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004171 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004172 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004173 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004174 return 0
4175
4176
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004177@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004178def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004179 """Shows or posts review comments for any changelist."""
4180 parser.add_option('-a', '--add-comment', dest='comment',
4181 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004182 parser.add_option('-p', '--publish', action='store_true',
4183 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004184 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004185 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004186 parser.add_option('-m', '--machine-readable', dest='readable',
4187 action='store_false', default=True,
4188 help='output comments in a format compatible with '
4189 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004190 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004191 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004192 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004193
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004194 issue = None
4195 if options.issue:
4196 try:
4197 issue = int(options.issue)
4198 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004199 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004200
Edward Lemur934836a2019-09-09 20:16:54 +00004201 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004202
4203 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004204 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004205 return 0
4206
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004207 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4208 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004209 for comment in summary:
4210 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004211 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004212 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004213 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004214 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004215 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004216 elif comment.autogenerated:
4217 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004218 else:
4219 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004220 print('\n%s%s %s%s\n%s' % (
4221 color,
4222 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4223 comment.sender,
4224 Fore.RESET,
4225 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4226
smut@google.comc85ac942015-09-15 16:34:43 +00004227 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004228 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004229 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004230 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4231 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004232 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004233 return 0
4234
4235
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004236@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004237@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004238def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004239 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004240 parser.add_option('-d', '--display', action='store_true',
4241 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004242 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004243 help='New description to set for this issue (- for stdin, '
4244 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004245 parser.add_option('-f', '--force', action='store_true',
4246 help='Delete any unpublished Gerrit edits for this issue '
4247 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004248
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004249 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004250
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004251 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004252 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004253 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004254 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004255 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004256
Edward Lemur934836a2019-09-09 20:16:54 +00004257 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004258 if target_issue_arg:
4259 kwargs['issue'] = target_issue_arg.issue
4260 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004261
4262 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004263 if not cl.GetIssue():
4264 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004265
Edward Lemur678a6842019-10-03 22:25:05 +00004266 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004267 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004268
Edward Lemur6c6827c2020-02-06 21:15:18 +00004269 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004270
smut@google.com34fb6b12015-07-13 20:03:26 +00004271 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004272 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004273 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004274
4275 if options.new_description:
4276 text = options.new_description
4277 if text == '-':
4278 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004279 elif text == '+':
4280 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004281 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004282
4283 description.set_description(text)
4284 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004285 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004286 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004287 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004288 return 0
4289
4290
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004291@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004292def CMDlint(parser, args):
4293 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004294 parser.add_option('--filter', action='append', metavar='-x,+y',
4295 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004296 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004297
4298 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004299 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004300 try:
4301 import cpplint
4302 import cpplint_chromium
4303 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004305 return 1
4306
4307 # Change the current working directory before calling lint so that it
4308 # shows the correct base.
4309 previous_cwd = os.getcwd()
4310 os.chdir(settings.GetRoot())
4311 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004312 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004313 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004314 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004315 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004316 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004317
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004318 # Process cpplint arguments, if any.
4319 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4320 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004321 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004322
Lei Zhang379d1ad2020-07-15 19:40:06 +00004323 include_regex = re.compile(settings.GetLintRegex())
4324 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004325 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4326 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004327 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004328 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004329 continue
4330
4331 if ignore_regex.match(filename):
4332 print('Ignoring file %s' % filename)
4333 continue
4334
4335 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4336 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004337 finally:
4338 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004339 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004340 if cpplint._cpplint_state.error_count != 0:
4341 return 1
4342 return 0
4343
4344
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004345@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004346def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004347 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004348 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004349 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004350 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004351 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004352 parser.add_option('--all', action='store_true',
4353 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004354 parser.add_option('--files',
4355 nargs=1,
4356 help='Semicolon-separated list of files to be marked as '
4357 'modified when executing presubmit or post-upload hooks. '
4358 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004359 parser.add_option('--parallel', action='store_true',
4360 help='Run all tests specified by input_api.RunTests in all '
4361 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004362 parser.add_option('--resultdb', action='store_true',
4363 help='Run presubmit checks in the ResultSink environment '
4364 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004365 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004366 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004367
sbc@chromium.org71437c02015-04-09 19:29:40 +00004368 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004370 return 1
4371
Edward Lemur934836a2019-09-09 20:16:54 +00004372 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004373 if args:
4374 base_branch = args[0]
4375 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004376 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004377 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004378
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004379 start = time.time()
4380 try:
4381 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4382 description = cl.FetchDescription()
4383 else:
4384 description = _create_description_from_log([base_branch])
4385 except Exception as e:
4386 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004387 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004388 elapsed = time.time() - start
4389 if elapsed > 5:
4390 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004391
Bruce Dawson13acea32022-05-03 22:13:08 +00004392 if not base_branch:
4393 if not options.force:
4394 print('use --force to check even when not on a branch.')
4395 return 1
4396 base_branch = 'HEAD'
4397
Josip Sokcevic017544d2022-03-31 23:47:53 +00004398 cl.RunHook(committing=not options.upload,
4399 may_prompt=False,
4400 verbose=options.verbose,
4401 parallel=options.parallel,
4402 upstream=base_branch,
4403 description=description,
4404 all_files=options.all,
4405 files=options.files,
4406 resultdb=options.resultdb,
4407 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004408 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004409
4410
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004411def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004412 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004413
4414 Works the same way as
4415 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4416 but can be called on demand on all platforms.
4417
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004418 The basic idea is to generate git hash of a state of the tree, original
4419 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004420 """
4421 lines = []
4422 tree_hash = RunGitSilent(['write-tree'])
4423 lines.append('tree %s' % tree_hash.strip())
4424 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4425 if code == 0:
4426 lines.append('parent %s' % parent.strip())
4427 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4428 lines.append('author %s' % author.strip())
4429 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4430 lines.append('committer %s' % committer.strip())
4431 lines.append('')
4432 # Note: Gerrit's commit-hook actually cleans message of some lines and
4433 # whitespace. This code is not doing this, but it clearly won't decrease
4434 # entropy.
4435 lines.append(message)
4436 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004437 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004438 return 'I%s' % change_hash.strip()
4439
4440
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004441def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004442 """Computes the remote branch ref to use for the CL.
4443
4444 Args:
4445 remote (str): The git remote for the CL.
4446 remote_branch (str): The git remote branch for the CL.
4447 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004448 """
4449 if not (remote and remote_branch):
4450 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004451
wittman@chromium.org455dc922015-01-26 20:15:50 +00004452 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004453 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004454 # refs, which are then translated into the remote full symbolic refs
4455 # below.
4456 if '/' not in target_branch:
4457 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4458 else:
4459 prefix_replacements = (
4460 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4461 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4462 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4463 )
4464 match = None
4465 for regex, replacement in prefix_replacements:
4466 match = re.search(regex, target_branch)
4467 if match:
4468 remote_branch = target_branch.replace(match.group(0), replacement)
4469 break
4470 if not match:
4471 # This is a branch path but not one we recognize; use as-is.
4472 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004473 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004474 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004475 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004476 # Handle the refs that need to land in different refs.
4477 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004478
wittman@chromium.org455dc922015-01-26 20:15:50 +00004479 # Create the true path to the remote branch.
4480 # Does the following translation:
4481 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004482 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004483 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4484 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4485 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4486 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4487 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4488 'refs/heads/')
4489 elif remote_branch.startswith('refs/remotes/branch-heads'):
4490 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004491
wittman@chromium.org455dc922015-01-26 20:15:50 +00004492 return remote_branch
4493
4494
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004495def cleanup_list(l):
4496 """Fixes a list so that comma separated items are put as individual items.
4497
4498 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4499 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4500 """
4501 items = sum((i.split(',') for i in l), [])
4502 stripped_items = (i.strip() for i in items)
4503 return sorted(filter(None, stripped_items))
4504
4505
Aaron Gable4db38df2017-11-03 14:59:07 -07004506@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004507@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004508def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004509 """Uploads the current changelist to codereview.
4510
4511 Can skip dependency patchset uploads for a branch by running:
4512 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004513 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004514 git config --unset branch.branch_name.skip-deps-uploads
4515 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004516
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004517 If the name of the checked out branch starts with "bug-" or "fix-" followed
4518 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004519 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004520
4521 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004522 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004523 [git-cl] add support for hashtags
4524 Foo bar: implement foo
4525 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004526 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004527 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4528 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004529 parser.add_option('--bypass-watchlists', action='store_true',
4530 dest='bypass_watchlists',
4531 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004532 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004533 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004534 parser.add_option('--message', '-m', dest='message',
4535 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004536 parser.add_option('-b', '--bug',
4537 help='pre-populate the bug number(s) for this issue. '
4538 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004539 parser.add_option('--message-file', dest='message_file',
4540 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004541 parser.add_option('--title', '-t', dest='title',
4542 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004543 parser.add_option('-T', '--skip-title', action='store_true',
4544 dest='skip_title',
4545 help='Use the most recent commit message as the title of '
4546 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004547 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004548 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004549 help='reviewer email addresses')
4550 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004551 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004552 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004553 parser.add_option('--hashtag', dest='hashtags',
4554 action='append', default=[],
4555 help=('Gerrit hashtag for new CL; '
4556 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004557 parser.add_option('-s',
4558 '--send-mail',
4559 '--send-email',
4560 dest='send_mail',
4561 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004562 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004563 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004564 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004565 metavar='TARGET',
4566 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004567 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004568 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004569 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004570 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004571 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004572 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004573 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004574 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4575 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004576 parser.add_option('-c',
4577 '--use-commit-queue',
4578 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004579 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004580 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004581 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004582 parser.add_option('-d', '--cq-dry-run',
4583 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004584 help='Send the patchset to do a CQ dry run right after '
4585 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004586 parser.add_option(
4587 '-q',
4588 '--cq-quick-run',
4589 action='store_true',
4590 default=False,
4591 help='Send the patchset to do a CQ quick run right after '
4592 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4593 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004594 parser.add_option('--set-bot-commit', action='store_true',
4595 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004596 parser.add_option('--preserve-tryjobs', action='store_true',
4597 help='instruct the CQ to let tryjobs running even after '
4598 'new patchsets are uploaded instead of canceling '
4599 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004600 parser.add_option('--dependencies', action='store_true',
4601 help='Uploads CLs of all the local branches that depend on '
4602 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004603 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4604 help='Sends your change to the CQ after an approval. Only '
4605 'works on repos that have the Auto-Submit label '
4606 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004607 parser.add_option('--parallel', action='store_true',
4608 help='Run all tests specified by input_api.RunTests in all '
4609 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004610 parser.add_option('--no-autocc', action='store_true',
4611 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004612 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004613 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004614 parser.add_option('-R', '--retry-failed', action='store_true',
4615 help='Retry failed tryjobs from old patchset immediately '
4616 'after uploading new patchset. Cannot be used with '
4617 '--use-commit-queue or --cq-dry-run.')
4618 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4619 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004620 parser.add_option('--fixed', '-x',
4621 help='List of bugs that will be commented on and marked '
4622 'fixed (pre-populates "Fixed:" tag). Same format as '
4623 '-b option / "Bug:" tag. If fixing several issues, '
4624 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004625 parser.add_option('--edit-description', action='store_true', default=False,
4626 help='Modify description before upload. Cannot be used '
4627 'with --force. It is a noop when --no-squash is set '
4628 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004629 parser.add_option('--git-completion-helper', action="store_true",
4630 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004631 parser.add_option('--resultdb', action='store_true',
4632 help='Run presubmit checks in the ResultSink environment '
4633 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004634 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004635 parser.add_option('-o',
4636 '--push-options',
4637 action='append',
4638 default=[],
4639 help='Transmit the given string to the server when '
4640 'performing git push (pass-through). See git-push '
4641 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004642 parser.add_option('--no-add-changeid',
4643 action='store_true',
4644 dest='no_add_changeid',
4645 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004646 parser.add_option('--no-python2-post-upload-hooks',
4647 action='store_true',
4648 help='Only run post-upload hooks in Python 3.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004649 parser.add_option('--stacked-exp',
4650 action='store_true',
4651 help=optparse.SUPPRESS_HELP)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004652
rmistry@google.com2dd99862015-06-22 12:22:18 +00004653 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004654 (options, args) = parser.parse_args(args)
4655
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004656 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004657 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4658 if opt.help != optparse.SUPPRESS_HELP))
4659 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004660
sbc@chromium.org71437c02015-04-09 19:29:40 +00004661 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004662 return 1
4663
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004664 options.reviewers = cleanup_list(options.reviewers)
4665 options.cc = cleanup_list(options.cc)
4666
Josipe827b0f2020-01-30 00:07:20 +00004667 if options.edit_description and options.force:
4668 parser.error('Only one of --force and --edit-description allowed')
4669
tandriib80458a2016-06-23 12:20:07 -07004670 if options.message_file:
4671 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004672 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004673 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004674
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004675 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004676 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004677 options.use_commit_queue,
4678 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004679 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4680 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004681
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004682 if options.skip_title and options.title:
4683 parser.error('Only one of --title and --skip-title allowed.')
4684
Aaron Gableedbc4132017-09-11 13:22:28 -07004685 if options.use_commit_queue:
4686 options.send_mail = True
4687
Edward Lesmes0dd54822020-03-26 18:24:25 +00004688 if options.squash is None:
4689 # Load default for user, repo, squash=true, in this order.
4690 options.squash = settings.GetSquashGerritUploads()
4691
Joanna Wang18de1f62023-01-21 01:24:24 +00004692 if options.stacked_exp:
4693 orig_args.remove('--stacked-exp')
4694
4695 UploadAllSquashed(options, orig_args)
4696 return 0
4697
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004698 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004699 # Warm change details cache now to avoid RPCs later, reducing latency for
4700 # developers.
4701 if cl.GetIssue():
4702 cl._GetChangeDetail(
4703 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4704
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004705 if options.retry_failed and not cl.GetIssue():
4706 print('No previous patchsets, so --retry-failed has no effect.')
4707 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004708
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004709 # cl.GetMostRecentPatchset uses cached information, and can return the last
4710 # patchset before upload. Calling it here makes it clear that it's the
4711 # last patchset before upload. Note that GetMostRecentPatchset will fail
4712 # if no CL has been uploaded yet.
4713 if options.retry_failed:
4714 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004715
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004716 ret = cl.CMDUpload(options, args, orig_args)
4717
4718 if options.retry_failed:
4719 if ret != 0:
4720 print('Upload failed, so --retry-failed has no effect.')
4721 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004722 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004723 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004724 jobs = _filter_failed_for_retry(builds)
4725 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004726 print('No failed tryjobs, so --retry-failed has no effect.')
4727 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004728 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004729
4730 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004731
4732
Joanna Wang18de1f62023-01-21 01:24:24 +00004733def UploadAllSquashed(options, orig_args):
4734 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4735 """Uploads the current and upstream branches (if necessary)."""
4736 _cls, _cherry_pick_current = _UploadAllPrecheck(options, orig_args)
4737
4738 # TODO(b/265929888): parse cls and create commits.
4739
4740
4741def _UploadAllPrecheck(options, orig_args):
4742 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4743 """Checks the state of the tree and gives the user uploading options
4744
4745 Returns: A tuple of the ordered list of changes that have new commits
4746 since their last upload and a boolean of whether the user wants to
4747 cherry-pick and upload the current branch instead of uploading all cls.
4748 """
4749 branch_ref = None
4750 cls = []
4751 must_upload_upstream = False
4752
4753 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4754
4755 while True:
4756 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4757 DieWithError(
4758 'More than %s branches in the stack have not been uploaded.\n'
4759 'Are your branches in a misconfigured state?\n'
4760 'If not, please upload some upstream changes first.' %
4761 (_MAX_STACKED_BRANCHES_UPLOAD))
4762
4763 cl = Changelist(branchref=branch_ref)
4764 cls.append(cl)
4765
4766 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
4767 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4768 branch_ref = upstream_branch_ref # set branch for next run.
4769
4770 # Case 1: We've reached the beginning of the tree.
4771 if origin != '.':
4772 break
4773
4774 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4775 upstream_branch,
4776 LAST_UPLOAD_HASH_CONFIG_KEY)
4777
4778 # Case 2: If any upstream branches have never been uploaded,
4779 # the user MUST upload them.
4780 if not upstream_last_upload:
4781 must_upload_upstream = True
4782 continue
4783
4784 base_commit = cl.GetCommonAncestorWithUpstream()
4785
4786 # Case 3: If upstream's last_upload == cl.base_commit we do
4787 # not need to upload any more upstreams from this point on.
4788 # (Even if there may be diverged branches higher up the tree)
4789 if base_commit == upstream_last_upload:
4790 break
4791
4792 # Case 4: If upstream's last_upload < cl.base_commit we are
4793 # uploading cl and upstream_cl.
4794 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004795 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00004796 continue
4797
4798 # Case 5: If cl.base_commit < upstream's last_upload the user
4799 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00004800 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00004801 DieWithError(
4802 'At least one branch in the stack has diverged from its upstream '
4803 'branch and does not contain its upstream\'s last upload.\n'
4804 'Please rebase the stack with `git rebase-update` before uploading.')
4805
4806 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
4807 # any relation to commits in the tree. Continue up the tree until we hit
4808 # the root.
4809
4810 # We assume all cls in the stack have the same auth requirements and only
4811 # check this once.
4812 cls[0].EnsureAuthenticated(force=options.force)
4813
4814 cherry_pick = False
4815 if len(cls) > 1:
4816 message = ''
4817 if len(orig_args):
4818 message = ('options %s will be used for all uploads.\n' % orig_args)
4819 if must_upload_upstream:
4820 confirm_or_exit('\n' + message +
4821 'There are upstream branches that must be uploaded.\n')
4822 else:
4823 answer = gclient_utils.AskForData(
4824 '\n' + message +
4825 'Press enter to update branches %s.\nOr type `n` to upload only '
4826 '`%s` cherry-picked on %s\'s last upload:' %
4827 ([cl.branch for cl in cls], cls[0].branch, cls[1].branch))
4828 if answer.lower() == 'n':
4829 cherry_pick = True
4830 return cls, cherry_pick
4831
4832
Francois Dorayd42c6812017-05-30 15:10:20 -04004833@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004834@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004835def CMDsplit(parser, args):
4836 """Splits a branch into smaller branches and uploads CLs.
4837
4838 Creates a branch and uploads a CL for each group of files modified in the
4839 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004840 comment, the string '$directory', is replaced with the directory containing
4841 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004842 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004843 parser.add_option('-d', '--description', dest='description_file',
4844 help='A text file containing a CL description in which '
4845 '$directory will be replaced by each CL\'s directory.')
4846 parser.add_option('-c', '--comment', dest='comment_file',
4847 help='A text file containing a CL comment.')
4848 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004849 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004850 help='List the files and reviewers for each CL that would '
4851 'be created, but don\'t create branches or CLs.')
4852 parser.add_option('--cq-dry-run', action='store_true',
4853 help='If set, will do a cq dry run for each uploaded CL. '
4854 'Please be careful when doing this; more than ~10 CLs '
4855 'has the potential to overload our build '
4856 'infrastructure. Try to upload these not during high '
4857 'load times (usually 11-3 Mountain View time). Email '
4858 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004859 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4860 default=True,
4861 help='Sends your change to the CQ after an approval. Only '
4862 'works on repos that have the Auto-Submit label '
4863 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004864 parser.add_option('--max-depth',
4865 type='int',
4866 default=0,
4867 help='The max depth to look for OWNERS files. Useful for '
4868 'controlling the granularity of the split CLs, e.g. '
4869 '--max-depth=1 will only split by top-level '
4870 'directory. Specifying a value less than 1 means no '
4871 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004872 options, _ = parser.parse_args(args)
4873
4874 if not options.description_file:
4875 parser.error('No --description flag specified.')
4876
4877 def WrappedCMDupload(args):
4878 return CMDupload(OptionParser(), args)
4879
Daniel Cheng403c44e2022-10-05 22:24:58 +00004880 return split_cl.SplitCl(options.description_file, options.comment_file,
4881 Changelist, WrappedCMDupload, options.dry_run,
4882 options.cq_dry_run, options.enable_auto_submit,
4883 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004884
4885
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004886@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004887@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004888def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004889 """DEPRECATED: Used to commit the current changelist via git-svn."""
4890 message = ('git-cl no longer supports committing to SVN repositories via '
4891 'git-svn. You probably want to use `git cl land` instead.')
4892 print(message)
4893 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004894
4895
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004896@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004897@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004898def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004899 """Commits the current changelist via git.
4900
4901 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4902 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004903 """
4904 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4905 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004906 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004907 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004908 parser.add_option('--parallel', action='store_true',
4909 help='Run all tests specified by input_api.RunTests in all '
4910 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004911 parser.add_option('--resultdb', action='store_true',
4912 help='Run presubmit checks in the ResultSink environment '
4913 'and send results to the ResultDB database.')
4914 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004915 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004916
Edward Lemur934836a2019-09-09 20:16:54 +00004917 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004918
Robert Iannucci2e73d432018-03-14 01:10:47 -07004919 if not cl.GetIssue():
4920 DieWithError('You must upload the change first to Gerrit.\n'
4921 ' If you would rather have `git cl land` upload '
4922 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004923 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4924 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004925
4926
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004927@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004928@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004929def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004930 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004931 parser.add_option('-b', dest='newbranch',
4932 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004933 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004934 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004935 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004936 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004937
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004938 group = optparse.OptionGroup(
4939 parser,
4940 'Options for continuing work on the current issue uploaded from a '
4941 'different clone (e.g. different machine). Must be used independently '
4942 'from the other options. No issue number should be specified, and the '
4943 'branch must have an issue number associated with it')
4944 group.add_option('--reapply', action='store_true', dest='reapply',
4945 help='Reset the branch and reapply the issue.\n'
4946 'CAUTION: This will undo any local changes in this '
4947 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004948
4949 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004950 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004951 parser.add_option_group(group)
4952
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004953 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004954
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004955 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004956 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004957 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004958 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004959 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004960
Edward Lemur934836a2019-09-09 20:16:54 +00004961 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004962 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004963 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004964
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004965 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004966 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004967 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004968
4969 RunGit(['reset', '--hard', upstream])
4970 if options.pull:
4971 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004972
Edward Lemur678a6842019-10-03 22:25:05 +00004973 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004974 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4975 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004976
4977 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004978 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004979
Edward Lemurf38bc172019-09-03 21:02:13 +00004980 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004981 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004982 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004983
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004984 # We don't want uncommitted changes mixed up with the patch.
4985 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004986 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004987
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004988 if options.newbranch:
4989 if options.force:
4990 RunGit(['branch', '-D', options.newbranch],
4991 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004992 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004993
Edward Lemur678a6842019-10-03 22:25:05 +00004994 cl = Changelist(
4995 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004996
Edward Lemur678a6842019-10-03 22:25:05 +00004997 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004998 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004999
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005000 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5001 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005002
5003
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005004def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005005 """Fetches the tree status and returns either 'open', 'closed',
5006 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005007 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005008 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005009 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005010 if status.find('closed') != -1 or status == '0':
5011 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005012
5013 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005014 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005015
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005016 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005017 return 'unset'
5018
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005019
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005020def GetTreeStatusReason():
5021 """Fetches the tree status from a json url and returns the message
5022 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005023 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005024 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005025 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005026 status = json.loads(connection.read())
5027 connection.close()
5028 return status['message']
5029
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005030
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005031@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005032def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005033 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005034 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005035 status = GetTreeStatus()
5036 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005037 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005038 return 2
5039
vapiera7fbd5a2016-06-16 09:17:49 -07005040 print('The tree is %s' % status)
5041 print()
5042 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005043 if status != 'open':
5044 return 1
5045 return 0
5046
5047
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005048@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005049def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005050 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5051 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005052 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005053 '-b', '--bot', action='append',
5054 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5055 'times to specify multiple builders. ex: '
5056 '"-b win_rel -b win_layout". See '
5057 'the try server waterfall for the builders name and the tests '
5058 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005059 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005060 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005061 help=('Buildbucket bucket to send the try requests. Format: '
5062 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005063 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005064 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005065 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005066 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005067 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005068 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005069 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005070 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005071 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005072 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005073 '-q',
5074 '--quick-run',
5075 action='store_true',
5076 default=False,
5077 help='trigger in quick run mode '
5078 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5079 'uick_run.md) (chromium only).')
5080 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005081 '--category', default='git_cl_try', help='Specify custom build category.')
5082 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005083 '--project',
5084 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005085 'in recipe to determine to which repository or directory to '
5086 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005087 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005088 '-p', '--property', dest='properties', action='append', default=[],
5089 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005090 'key2=value2 etc. The value will be treated as '
5091 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005092 'NOTE: using this may make your tryjob not usable for CQ, '
5093 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005094 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005095 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5096 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005097 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005098 parser.add_option(
5099 '-R', '--retry-failed', action='store_true', default=False,
5100 help='Retry failed jobs from the latest set of tryjobs. '
5101 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005102 parser.add_option(
5103 '-i', '--issue', type=int,
5104 help='Operate on this issue instead of the current branch\'s implicit '
5105 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005106 options, args = parser.parse_args(args)
5107
machenbach@chromium.org45453142015-09-15 08:45:22 +00005108 # Make sure that all properties are prop=value pairs.
5109 bad_params = [x for x in options.properties if '=' not in x]
5110 if bad_params:
5111 parser.error('Got properties with missing "=": %s' % bad_params)
5112
maruel@chromium.org15192402012-09-06 12:38:29 +00005113 if args:
5114 parser.error('Unknown arguments: %s' % args)
5115
Edward Lemur934836a2019-09-09 20:16:54 +00005116 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005117 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005118 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005119
Edward Lemurf38bc172019-09-03 21:02:13 +00005120 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005121 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005122
tandriie113dfd2016-10-11 10:20:12 -07005123 error_message = cl.CannotTriggerTryJobReason()
5124 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005125 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005126
Edward Lemur45768512020-03-02 19:03:14 +00005127 if options.bot:
5128 if options.retry_failed:
5129 parser.error('--bot is not compatible with --retry-failed.')
5130 if not options.bucket:
5131 parser.error('A bucket (e.g. "chromium/try") is required.')
5132
5133 triggered = [b for b in options.bot if 'triggered' in b]
5134 if triggered:
5135 parser.error(
5136 'Cannot schedule builds on triggered bots: %s.\n'
5137 'This type of bot requires an initial job from a parent (usually a '
5138 'builder). Schedule a job on the parent instead.\n' % triggered)
5139
5140 if options.bucket.startswith('.master'):
5141 parser.error('Buildbot masters are not supported.')
5142
5143 project, bucket = _parse_bucket(options.bucket)
5144 if project is None or bucket is None:
5145 parser.error('Invalid bucket: %s.' % options.bucket)
5146 jobs = sorted((project, bucket, bot) for bot in options.bot)
5147 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005148 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00005149 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005150 if options.verbose:
5151 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005152 jobs = _filter_failed_for_retry(builds)
5153 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005154 print('There are no failed jobs in the latest set of jobs '
5155 '(patchset #%d), doing nothing.' % patchset)
5156 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005157 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005158 if num_builders > 10:
5159 confirm_or_exit('There are %d builders with failed builds.'
5160 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005161 elif options.quick_run:
5162 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5163 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005164 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005165 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005166 print('git cl try with no bots now defaults to CQ dry run.')
5167 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5168 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005169
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005170 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005171 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005172 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005173 except BuildbucketResponseException as ex:
5174 print('ERROR: %s' % ex)
5175 return 1
5176 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005177
5178
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005179@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005180def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005181 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005182 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005183 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005184 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005185 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005186 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005187 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005188 '--color', action='store_true', default=setup_color.IS_TTY,
5189 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005190 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005191 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5192 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005193 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005194 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005195 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005196 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005197 parser.add_option(
5198 '-i', '--issue', type=int,
5199 help='Operate on this issue instead of the current branch\'s implicit '
5200 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005201 options, args = parser.parse_args(args)
5202 if args:
5203 parser.error('Unrecognized args: %s' % ' '.join(args))
5204
Edward Lemur934836a2019-09-09 20:16:54 +00005205 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005206 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005207 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005208
tandrii221ab252016-10-06 08:12:04 -07005209 patchset = options.patchset
5210 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005211 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005212 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005213 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005214 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005215 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005216 cl.GetIssue())
5217
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005218 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005219 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005220 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005221 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005222 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005223 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005224 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005225 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005226 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005227 return 0
5228
5229
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005230@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005231@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005232def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005233 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005234 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005235 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005236 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005237
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005238 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005239 if args:
5240 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005241 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005242 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005243 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005244 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005245
5246 # Clear configured merge-base, if there is one.
5247 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005248 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005249 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005250 return 0
5251
5252
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005253@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005254def CMDweb(parser, args):
5255 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005256 parser.add_option('-p',
5257 '--print-only',
5258 action='store_true',
5259 dest='print_only',
5260 help='Only print the Gerrit URL, don\'t open it in the '
5261 'browser.')
5262 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005263 if args:
5264 parser.error('Unrecognized args: %s' % ' '.join(args))
5265
5266 issue_url = Changelist().GetIssueURL()
5267 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005268 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005269 return 1
5270
Orr Bernstein0b960582022-12-22 20:16:18 +00005271 if options.print_only:
5272 print(issue_url)
5273 return 0
5274
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005275 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005276 # allows us to hide the "Created new window in existing browser session."
5277 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005278 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005279 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005280 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005281 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005282 os.open(os.devnull, os.O_RDWR)
5283 try:
5284 webbrowser.open(issue_url)
5285 finally:
5286 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005287 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005288 return 0
5289
5290
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005291@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005292def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005293 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005294 parser.add_option('-d', '--dry-run', action='store_true',
5295 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005296 parser.add_option(
5297 '-q',
5298 '--quick-run',
5299 action='store_true',
5300 help='trigger in quick run mode '
5301 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5302 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005303 parser.add_option('-c', '--clear', action='store_true',
5304 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005305 parser.add_option(
5306 '-i', '--issue', type=int,
5307 help='Operate on this issue instead of the current branch\'s implicit '
5308 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005309 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005310 if args:
5311 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005312 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5313 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005314
Edward Lemur934836a2019-09-09 20:16:54 +00005315 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005316 if not cl.GetIssue():
5317 parser.error('Must upload the issue first.')
5318
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005319 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005320 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005321 elif options.quick_run:
5322 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005323 elif options.dry_run:
5324 state = _CQState.DRY_RUN
5325 else:
5326 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005327 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005328 return 0
5329
5330
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005331@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005332def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005333 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005334 parser.add_option(
5335 '-i', '--issue', type=int,
5336 help='Operate on this issue instead of the current branch\'s implicit '
5337 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005338 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005339 if args:
5340 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005341 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005342 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005343 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005344 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005345 cl.CloseIssue()
5346 return 0
5347
5348
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005349@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005350def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005351 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005352 parser.add_option(
5353 '--stat',
5354 action='store_true',
5355 dest='stat',
5356 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005357 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005358 if args:
5359 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005360
Edward Lemur934836a2019-09-09 20:16:54 +00005361 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005362 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005363 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005364 if not issue:
5365 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005366
Gavin Makbe2e9262022-11-08 23:41:55 +00005367 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005368 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005369 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005370 if not base:
5371 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5372 revision_info = detail['revisions'][detail['current_revision']]
5373 fetch_info = revision_info['fetch']['http']
5374 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5375 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005376
Aaron Gablea718c3e2017-08-28 17:47:28 -07005377 cmd = ['git', 'diff']
5378 if options.stat:
5379 cmd.append('--stat')
5380 cmd.append(base)
5381 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005382
5383 return 0
5384
5385
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005386@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005387def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005388 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005389 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005390 '--ignore-current',
5391 action='store_true',
5392 help='Ignore the CL\'s current reviewers and start from scratch.')
5393 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005394 '--ignore-self',
5395 action='store_true',
5396 help='Do not consider CL\'s author as an owners.')
5397 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005398 '--no-color',
5399 action='store_true',
5400 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005401 parser.add_option(
5402 '--batch',
5403 action='store_true',
5404 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005405 # TODO: Consider moving this to another command, since other
5406 # git-cl owners commands deal with owners for a given CL.
5407 parser.add_option(
5408 '--show-all',
5409 action='store_true',
5410 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005411 options, args = parser.parse_args(args)
5412
Edward Lemur934836a2019-09-09 20:16:54 +00005413 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005414 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005415
Yang Guo6e269a02019-06-26 11:17:02 +00005416 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005417 if len(args) == 0:
5418 print('No files specified for --show-all. Nothing to do.')
5419 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005420 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005421 for path in args:
5422 print('Owners for %s:' % path)
5423 print('\n'.join(
5424 ' - %s' % owner
5425 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005426 return 0
5427
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005428 if args:
5429 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005430 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005431 base_branch = args[0]
5432 else:
5433 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005434 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005435
Edward Lemur2c62b332020-03-12 22:12:33 +00005436 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005437
5438 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005439 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5440 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005441 return 0
5442
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005443 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005444 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005445 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005446 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005447 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005448 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005449 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005450
5451
Aiden Bennerc08566e2018-10-03 17:52:42 +00005452def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005453 """Generates a diff command."""
5454 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005455 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5456
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005457 if allow_prefix:
5458 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5459 # case that diff.noprefix is set in the user's git config.
5460 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5461 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005462 diff_cmd += ['--no-prefix']
5463
5464 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005465
5466 if args:
5467 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005468 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005469 diff_cmd.append(arg)
5470 else:
5471 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005472
5473 return diff_cmd
5474
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005475
Jamie Madill5e96ad12020-01-13 16:08:35 +00005476def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5477 """Runs clang-format-diff and sets a return value if necessary."""
5478
5479 if not clang_diff_files:
5480 return 0
5481
5482 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5483 # formatted. This is used to block during the presubmit.
5484 return_value = 0
5485
5486 # Locate the clang-format binary in the checkout
5487 try:
5488 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5489 except clang_format.NotFoundError as e:
5490 DieWithError(e)
5491
5492 if opts.full or settings.GetFormatFullByDefault():
5493 cmd = [clang_format_tool]
5494 if not opts.dry_run and not opts.diff:
5495 cmd.append('-i')
5496 if opts.dry_run:
5497 for diff_file in clang_diff_files:
5498 with open(diff_file, 'r') as myfile:
5499 code = myfile.read().replace('\r\n', '\n')
5500 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5501 stdout = stdout.replace('\r\n', '\n')
5502 if opts.diff:
5503 sys.stdout.write(stdout)
5504 if code != stdout:
5505 return_value = 2
5506 else:
5507 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5508 if opts.diff:
5509 sys.stdout.write(stdout)
5510 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005511 try:
5512 script = clang_format.FindClangFormatScriptInChromiumTree(
5513 'clang-format-diff.py')
5514 except clang_format.NotFoundError as e:
5515 DieWithError(e)
5516
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005517 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005518 if not opts.dry_run and not opts.diff:
5519 cmd.append('-i')
5520
5521 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005522 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005523
Edward Lesmes89624cd2020-04-06 17:51:56 +00005524 env = os.environ.copy()
5525 env['PATH'] = (
5526 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5527 stdout = RunCommand(
5528 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005529 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005530 if opts.diff:
5531 sys.stdout.write(stdout)
5532 if opts.dry_run and len(stdout) > 0:
5533 return_value = 2
5534
5535 return return_value
5536
5537
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005538def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5539 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5540 presubmit checks have failed (and returns 0 otherwise)."""
5541
5542 if not rust_diff_files:
5543 return 0
5544
5545 # Locate the rustfmt binary.
5546 try:
5547 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5548 except rustfmt.NotFoundError as e:
5549 DieWithError(e)
5550
5551 # TODO(crbug.com/1231317): Support formatting only the changed lines
5552 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5553 # https://github.com/emilio/rustfmt-format-diff
5554 cmd = [rustfmt_tool]
5555 if opts.dry_run:
5556 cmd.append('--check')
5557 cmd += rust_diff_files
5558 rustfmt_exitcode = subprocess2.call(cmd)
5559
5560 if opts.presubmit and rustfmt_exitcode != 0:
5561 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005562
5563 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005564
5565
Olivier Robin0a6b5442022-04-07 07:25:04 +00005566def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5567 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5568 that presubmit checks have failed (and returns 0 otherwise)."""
5569
5570 if not swift_diff_files:
5571 return 0
5572
5573 # Locate the swift-format binary.
5574 try:
5575 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5576 except swift_format.NotFoundError as e:
5577 DieWithError(e)
5578
5579 cmd = [swift_format_tool]
5580 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005581 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005582 else:
5583 cmd += ['format', '-i']
5584 cmd += swift_diff_files
5585 swift_format_exitcode = subprocess2.call(cmd)
5586
5587 if opts.presubmit and swift_format_exitcode != 0:
5588 return 2
5589
5590 return 0
5591
5592
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005593def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005594 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005595 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005596
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005597
enne@chromium.org555cfe42014-01-29 18:21:39 +00005598@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005599@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005600def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005601 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005602 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005603 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005604 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005605 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005606 parser.add_option('--full', action='store_true',
5607 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005608 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005609 parser.add_option('--dry-run', action='store_true',
5610 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005611 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005612 '--no-clang-format',
5613 dest='clang_format',
5614 action='store_false',
5615 default=True,
5616 help='Disables formatting of various file types using clang-format.')
5617 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005618 '--python',
5619 action='store_true',
5620 default=None,
5621 help='Enables python formatting on all python files.')
5622 parser.add_option(
5623 '--no-python',
5624 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005625 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005626 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005627 'If neither --python or --no-python are set, python files that have a '
5628 '.style.yapf file in an ancestor directory will be formatted. '
5629 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005630 parser.add_option(
5631 '--js',
5632 action='store_true',
5633 help='Format javascript code with clang-format. '
5634 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005635 parser.add_option('--diff', action='store_true',
5636 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005637 parser.add_option('--presubmit', action='store_true',
5638 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005639
5640 parser.add_option('--rust-fmt',
5641 dest='use_rust_fmt',
5642 action='store_true',
5643 default=rustfmt.IsRustfmtSupported(),
5644 help='Enables formatting of Rust file types using rustfmt.')
5645 parser.add_option(
5646 '--no-rust-fmt',
5647 dest='use_rust_fmt',
5648 action='store_false',
5649 help='Disables formatting of Rust file types using rustfmt.')
5650
Olivier Robin0a6b5442022-04-07 07:25:04 +00005651 parser.add_option(
5652 '--swift-format',
5653 dest='use_swift_format',
5654 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005655 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005656 help='Enables formatting of Swift file types using swift-format '
5657 '(macOS host only).')
5658 parser.add_option(
5659 '--no-swift-format',
5660 dest='use_swift_format',
5661 action='store_false',
5662 help='Disables formatting of Swift file types using swift-format.')
5663
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005664 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005665
Garrett Beaty91a6f332020-01-06 16:57:24 +00005666 if opts.python is not None and opts.no_python:
5667 raise parser.error('Cannot set both --python and --no-python')
5668 if opts.no_python:
5669 opts.python = False
5670
Daniel Chengc55eecf2016-12-30 03:11:02 -08005671 # Normalize any remaining args against the current path, so paths relative to
5672 # the current directory are still resolved as expected.
5673 args = [os.path.join(os.getcwd(), arg) for arg in args]
5674
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005675 # git diff generates paths against the root of the repository. Change
5676 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005677 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005678 if rel_base_path:
5679 os.chdir(rel_base_path)
5680
digit@chromium.org29e47272013-05-17 17:01:46 +00005681 # Grab the merge-base commit, i.e. the upstream commit of the current
5682 # branch when it was created or the last time it was rebased. This is
5683 # to cover the case where the user may have called "git fetch origin",
5684 # moving the origin branch to a newer commit, but hasn't rebased yet.
5685 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005686 upstream_branch = opts.upstream
5687 if not upstream_branch:
5688 cl = Changelist()
5689 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005690 if upstream_branch:
5691 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5692 upstream_commit = upstream_commit.strip()
5693
5694 if not upstream_commit:
5695 DieWithError('Could not find base commit for this branch. '
5696 'Are you in detached state?')
5697
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005698 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5699 diff_output = RunGit(changed_files_cmd)
5700 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005701 # Filter out files deleted by this CL
5702 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005703
Andreas Haas417d89c2020-02-06 10:24:27 +00005704 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005705 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005706
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005707 clang_diff_files = []
5708 if opts.clang_format:
5709 clang_diff_files = [
5710 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5711 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005712 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005713 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005714 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005715 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005716
Edward Lesmes50da7702020-03-30 19:23:43 +00005717 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005718
Jamie Madill5e96ad12020-01-13 16:08:35 +00005719 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5720 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005721
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005722 if opts.use_rust_fmt:
5723 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5724 upstream_commit)
5725 if rust_fmt_return_value == 2:
5726 return_value = 2
5727
Olivier Robin0a6b5442022-04-07 07:25:04 +00005728 if opts.use_swift_format:
5729 if sys.platform != 'darwin':
5730 DieWithError('swift-format is only supported on macOS.')
5731 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5732 upstream_commit)
5733 if swift_format_return_value == 2:
5734 return_value = 2
5735
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005736 # Similar code to above, but using yapf on .py files rather than clang-format
5737 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005738 py_explicitly_disabled = opts.python is not None and not opts.python
5739 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005740 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5741 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005742
Aiden Bennerc08566e2018-10-03 17:52:42 +00005743 # Used for caching.
5744 yapf_configs = {}
5745 for f in python_diff_files:
5746 # Find the yapf style config for the current file, defaults to depot
5747 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005748 _FindYapfConfigFile(f, yapf_configs, top_dir)
5749
5750 # Turn on python formatting by default if a yapf config is specified.
5751 # This breaks in the case of this repo though since the specified
5752 # style file is also the global default.
5753 if opts.python is None:
5754 filtered_py_files = []
5755 for f in python_diff_files:
5756 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5757 filtered_py_files.append(f)
5758 else:
5759 filtered_py_files = python_diff_files
5760
5761 # Note: yapf still seems to fix indentation of the entire file
5762 # even if line ranges are specified.
5763 # See https://github.com/google/yapf/issues/499
5764 if not opts.full and filtered_py_files:
5765 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5766
Brian Sheedyb4307d52019-12-02 19:18:17 +00005767 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5768 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5769 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005770
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005771 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005772 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5773 # Default to pep8 if not .style.yapf is found.
5774 if not yapf_style:
5775 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005776
Peter Wend9399922020-06-17 17:33:49 +00005777 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005778 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005779 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005780 else:
5781 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005782
5783 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005784
5785 has_formattable_lines = False
5786 if not opts.full:
5787 # Only run yapf over changed line ranges.
5788 for diff_start, diff_len in py_line_diffs[f]:
5789 diff_end = diff_start + diff_len - 1
5790 # Yapf errors out if diff_end < diff_start but this
5791 # is a valid line range diff for a removal.
5792 if diff_end >= diff_start:
5793 has_formattable_lines = True
5794 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5795 # If all line diffs were removals we have nothing to format.
5796 if not has_formattable_lines:
5797 continue
5798
5799 if opts.diff or opts.dry_run:
5800 cmd += ['--diff']
5801 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005802 stdout = RunCommand(cmd,
5803 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005804 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005805 cwd=top_dir,
5806 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005807 if opts.diff:
5808 sys.stdout.write(stdout)
5809 elif len(stdout) > 0:
5810 return_value = 2
5811 else:
5812 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005813 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005814
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005815 # Format GN build files. Always run on full build files for canonical form.
5816 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005817 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005818 if opts.dry_run or opts.diff:
5819 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005820 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005821 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005822 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005823 cwd=top_dir)
5824 if opts.dry_run and gn_ret == 2:
5825 return_value = 2 # Not formatted.
5826 elif opts.diff and gn_ret == 2:
5827 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005828 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005829 elif gn_ret != 0:
5830 # For non-dry run cases (and non-2 return values for dry-run), a
5831 # nonzero error code indicates a failure, probably because the file
5832 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005833 DieWithError('gn format failed on ' + gn_diff_file +
5834 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005835
Ilya Shermane081cbe2017-08-15 17:51:04 -07005836 # Skip the metrics formatting from the global presubmit hook. These files have
5837 # a separate presubmit hook that issues an error if the files need formatting,
5838 # whereas the top-level presubmit script merely issues a warning. Formatting
5839 # these files is somewhat slow, so it's important not to duplicate the work.
5840 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005841 for diff_xml in GetDiffXMLs(diff_files):
5842 xml_dir = GetMetricsDir(diff_xml)
5843 if not xml_dir:
5844 continue
5845
Ilya Shermane081cbe2017-08-15 17:51:04 -07005846 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005847 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005848 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005849
5850 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5851 # command as histograms/pretty_print.py now needs a relative path argument
5852 # after splitting the histograms into multiple directories.
5853 # For example, in tools/metrics/ukm, pretty-print could be run using:
5854 # $ python pretty_print.py
5855 # But in tools/metrics/histogrmas, pretty-print should be run with an
5856 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005857 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005858 # $ python pretty_print.py enums.xml
5859
Weilun Shib92c4b72020-08-27 17:45:11 +00005860 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005861 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005862 cmd.append(diff_xml)
5863
Ilya Shermane081cbe2017-08-15 17:51:04 -07005864 if opts.dry_run or opts.diff:
5865 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005866
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005867 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5868 # `shell` param and instead replace `'vpython'` with
5869 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005870 stdout = RunCommand(cmd,
5871 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005872 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005873 if opts.diff:
5874 sys.stdout.write(stdout)
5875 if opts.dry_run and stdout:
5876 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005877
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005878 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005879
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005880
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005881def GetDiffXMLs(diff_files):
5882 return [
5883 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5884 ]
5885
5886
5887def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005888 metrics_xml_dirs = [
5889 os.path.join('tools', 'metrics', 'actions'),
5890 os.path.join('tools', 'metrics', 'histograms'),
5891 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005892 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005893 os.path.join('tools', 'metrics', 'ukm'),
5894 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005895 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005896 if diff_xml.startswith(xml_dir):
5897 return xml_dir
5898 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005899
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005900
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005901@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005902@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005903def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005904 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005905 _, args = parser.parse_args(args)
5906
5907 if len(args) != 1:
5908 parser.print_help()
5909 return 1
5910
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005911 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005912 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005913 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005914
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005915 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005916
Edward Lemur52969c92020-02-06 18:15:28 +00005917 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005918 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005919 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005920
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005921 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005922 for key, issue in [x.split() for x in output.splitlines()]:
5923 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005924 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005925
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005926 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005927 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005928 return 1
5929 if len(branches) == 1:
5930 RunGit(['checkout', branches[0]])
5931 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005932 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005933 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005934 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005935 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005936 try:
5937 RunGit(['checkout', branches[int(which)]])
5938 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005939 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005940 return 1
5941
5942 return 0
5943
5944
maruel@chromium.org29404b52014-09-08 22:58:00 +00005945def CMDlol(parser, args):
5946 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005947 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005948 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5949 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5950 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005951 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005952 return 0
5953
5954
Josip Sokcevic0399e172022-03-21 23:11:51 +00005955def CMDversion(parser, args):
5956 import utils
5957 print(utils.depot_tools_version())
5958
5959
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005960class OptionParser(optparse.OptionParser):
5961 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005962
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005963 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005964 optparse.OptionParser.__init__(
5965 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005966 self.add_option(
5967 '-v', '--verbose', action='count', default=0,
5968 help='Use 2 times for more debugging info')
5969
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005970 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005971 try:
5972 return self._parse_args(args)
5973 finally:
5974 # Regardless of success or failure of args parsing, we want to report
5975 # metrics, but only after logging has been initialized (if parsing
5976 # succeeded).
5977 global settings
5978 settings = Settings()
5979
Edward Lesmes9c349062021-05-06 20:02:39 +00005980 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005981 # GetViewVCUrl ultimately calls logging method.
5982 project_url = settings.GetViewVCUrl().strip('/+')
5983 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5984 metrics.collector.add('project_urls', [project_url])
5985
5986 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005987 # Create an optparse.Values object that will store only the actual passed
5988 # options, without the defaults.
5989 actual_options = optparse.Values()
5990 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5991 # Create an optparse.Values object with the default options.
5992 options = optparse.Values(self.get_default_values().__dict__)
5993 # Update it with the options passed by the user.
5994 options._update_careful(actual_options.__dict__)
5995 # Store the options passed by the user in an _actual_options attribute.
5996 # We store only the keys, and not the values, since the values can contain
5997 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005998 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005999
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006000 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006001 logging.basicConfig(
6002 level=levels[min(options.verbose, len(levels) - 1)],
6003 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6004 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006005
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006006 return options, args
6007
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006009def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006010 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006011 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006012 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006013 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006014
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006015 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006016 dispatcher = subcommand.CommandDispatcher(__name__)
6017 try:
6018 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006019 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006020 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006021 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006022 if e.code != 500:
6023 raise
6024 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006025 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006026 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006027 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006028
6029
6030if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006031 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6032 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006033 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006034 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006035 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006036 sys.exit(main(sys.argv[1:]))