blob: 806dad2c199c8bfab0723e53d3a8d6b304d8e508 [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'
128
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000129# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000130Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000131
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000132# Initialized in main()
133settings = None
134
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100135# Used by tests/git_cl_test.py to add extra logging.
136# Inside the weirdly failing test, add this:
137# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700138# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100139_IS_BEING_TESTED = False
140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000142_KNOWN_GERRIT_TO_SHORT_URLS = {
143 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
144 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
145}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000146assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
147 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000148
149
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000150class GitPushError(Exception):
151 pass
152
153
Christopher Lamf732cd52017-01-24 12:40:11 +1100154def DieWithError(message, change_desc=None):
155 if change_desc:
156 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000157 print('\n ** Content of CL description **\n' +
158 '='*72 + '\n' +
159 change_desc.description + '\n' +
160 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100161
vapiera7fbd5a2016-06-16 09:17:49 -0700162 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000163 sys.exit(1)
164
165
Christopher Lamf732cd52017-01-24 12:40:11 +1100166def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000167 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000168 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000169 with open(backup_path, 'wb') as backup_file:
170 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100171
172
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000173def GetNoGitPagerEnv():
174 env = os.environ.copy()
175 # 'cat' is a magical git string that disables pagers on all platforms.
176 env['GIT_PAGER'] = 'cat'
177 return env
178
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000179
bsep@chromium.org627d9002016-04-29 00:00:52 +0000180def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000181 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000182 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
183 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000184 except subprocess2.CalledProcessError as e:
185 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000186 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000187 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
188 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000189 out = e.stdout.decode('utf-8', 'replace')
190 if e.stderr:
191 out += e.stderr.decode('utf-8', 'replace')
192 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
195def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000197 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000198
199
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000200def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000201 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700202 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000203 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700204 else:
205 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000206 try:
tandrii5d48c322016-08-18 16:19:37 -0700207 (out, _), code = subprocess2.communicate(['git'] + args,
208 env=GetNoGitPagerEnv(),
209 stdout=subprocess2.PIPE,
210 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000211 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700212 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900213 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000214 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000215
216
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000217def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000218 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000219 return RunGitWithCode(args, suppress_stderr=True)[1]
220
221
tandrii2a16b952016-10-19 07:09:44 -0700222def time_sleep(seconds):
223 # Use this so that it can be mocked in tests without interfering with python
224 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700225 return time.sleep(seconds)
226
227
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000228def time_time():
229 # Use this so that it can be mocked in tests without interfering with python
230 # system machinery.
231 return time.time()
232
233
Edward Lemur1b52d872019-05-09 21:12:12 +0000234def datetime_now():
235 # Use this so that it can be mocked in tests without interfering with python
236 # system machinery.
237 return datetime.datetime.now()
238
239
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240def confirm_or_exit(prefix='', action='confirm'):
241 """Asks user to press enter to continue or press Ctrl+C to abort."""
242 if not prefix or prefix.endswith('\n'):
243 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100244 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245 mid = ' Press'
246 elif prefix.endswith(' '):
247 mid = 'press'
248 else:
249 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000250 gclient_utils.AskForData(
251 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252
253
254def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000255 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000256 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100257 while True:
258 if 'yes'.startswith(result):
259 return True
260 if 'no'.startswith(result):
261 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000262 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100263
264
machenbach@chromium.org45453142015-09-15 08:45:22 +0000265def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000266 prop_list = getattr(options, 'properties', [])
267 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000268 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000269 try:
270 properties[key] = json.loads(val)
271 except ValueError:
272 pass # If a value couldn't be evaluated, treat it as a string.
273 return properties
274
275
Edward Lemur4c707a22019-09-24 21:13:43 +0000276def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000277 """Calls a buildbucket v2 method and returns the parsed json response."""
278 headers = {
279 'Accept': 'application/json',
280 'Content-Type': 'application/json',
281 }
282 request = json.dumps(request)
283 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
284
285 logging.info('POST %s with %s' % (url, request))
286
287 attempts = 1
288 time_to_sleep = 1
289 while True:
290 response, content = http.request(url, 'POST', body=request, headers=headers)
291 if response.status == 200:
292 return json.loads(content[4:])
293 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
294 msg = '%s error when calling POST %s with %s: %s' % (
295 response.status, url, request, content)
296 raise BuildbucketResponseException(msg)
297 logging.debug(
298 '%s error when calling POST %s with %s. '
299 'Sleeping for %d seconds and retrying...' % (
300 response.status, url, request, time_to_sleep))
301 time.sleep(time_to_sleep)
302 time_to_sleep *= 2
303 attempts += 1
304
305 assert False, 'unreachable'
306
307
Edward Lemur6215c792019-10-03 21:59:05 +0000308def _parse_bucket(raw_bucket):
309 legacy = True
310 project = bucket = None
311 if '/' in raw_bucket:
312 legacy = False
313 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000314 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000315 elif raw_bucket.startswith('luci.'):
316 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000317 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000318 elif '.' in raw_bucket:
319 project = raw_bucket.split('.')[0]
320 bucket = raw_bucket
321 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000322 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000323 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
324 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325
326
Quinten Yearsley777660f2020-03-04 23:37:06 +0000327def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000328 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700329
330 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000331 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000332 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700333 options: Command-line options.
334 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000335 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000336 for project, bucket, builder in jobs:
337 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000338 print('To see results here, run: git cl try-results')
339 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700340
Quinten Yearsley777660f2020-03-04 23:37:06 +0000341 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000342 if not requests:
343 return
344
Edward Lemur5b929a42019-10-21 17:57:39 +0000345 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000346 http.force_exception_to_status_code = True
347
348 batch_request = {'requests': requests}
349 batch_response = _call_buildbucket(
350 http, options.buildbucket_host, 'Batch', batch_request)
351
352 errors = [
353 ' ' + response['error']['message']
354 for response in batch_response.get('responses', [])
355 if 'error' in response
356 ]
357 if errors:
358 raise BuildbucketResponseException(
359 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
360
361
Quinten Yearsley777660f2020-03-04 23:37:06 +0000362def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000363 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000364 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000365 shared_properties = {
366 'category': options.ensure_value('category', 'git_cl_try')
367 }
368 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000369 shared_properties['clobber'] = True
370 shared_properties.update(_get_properties_from_options(options) or {})
371
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000372 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000373 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000374 shared_tags.append({'key': 'retry_failed',
375 'value': '1'})
376
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000378 for (project, bucket, builder) in jobs:
379 properties = shared_properties.copy()
380 if 'presubmit' in builder.lower():
381 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000382
Edward Lemur45768512020-03-02 19:03:14 +0000383 requests.append({
384 'scheduleBuild': {
385 'requestId': str(uuid.uuid4()),
386 'builder': {
387 'project': getattr(options, 'project', None) or project,
388 'bucket': bucket,
389 'builder': builder,
390 },
391 'gerritChanges': gerrit_changes,
392 'properties': properties,
393 'tags': [
394 {'key': 'builder', 'value': builder},
395 ] + shared_tags,
396 }
397 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000398
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000399 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000400 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000401 requests[-1]['scheduleBuild']['gitilesCommit'] = {
402 'host': gerrit_changes[0]['host'],
403 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000404 'id': options.revision,
405 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000406 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000407
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000408 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000409
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000410
Quinten Yearsley777660f2020-03-04 23:37:06 +0000411def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000412 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000413
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000414 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000415 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000416 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000417 request = {
418 'predicate': {
419 'gerritChanges': [changelist.GetGerritChange(patchset)],
420 },
421 'fields': ','.join('builds.*.' + field for field in fields),
422 }
tandrii221ab252016-10-06 08:12:04 -0700423
Edward Lemur5b929a42019-10-21 17:57:39 +0000424 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 if authenticator.has_cached_credentials():
426 http = authenticator.authorize(httplib2.Http())
427 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700428 print('Warning: Some results might be missing because %s' %
429 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000430 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000432 http.force_exception_to_status_code = True
433
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000434 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
435 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000436
Edward Lemur45768512020-03-02 19:03:14 +0000437
Edward Lemur5b929a42019-10-21 17:57:39 +0000438def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000439 """Fetches builds from the latest patchset that has builds (within
440 the last few patchsets).
441
442 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000443 changelist (Changelist): The CL to fetch builds for
444 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000445 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
446 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000447 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000448 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
449 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000450 """
451 assert buildbucket_host
452 assert changelist.GetIssue(), 'CL must be uploaded first'
453 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000454 if latest_patchset is None:
455 assert changelist.GetMostRecentPatchset()
456 ps = changelist.GetMostRecentPatchset()
457 else:
458 assert latest_patchset > 0, latest_patchset
459 ps = latest_patchset
460
Quinten Yearsley983111f2019-09-26 17:18:48 +0000461 min_ps = max(1, ps - 5)
462 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000463 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000464 if len(builds):
465 return builds, ps
466 ps -= 1
467 return [], 0
468
469
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470def _filter_failed_for_retry(all_builds):
471 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000472
473 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000474 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000475 i.e. a list of buildbucket.v2.Builds which includes status and builder
476 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000477
478 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000479 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000480 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000481 """
Edward Lemur45768512020-03-02 19:03:14 +0000482 grouped = {}
483 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000484 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000485 key = (builder['project'], builder['bucket'], builder['builder'])
486 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000487
Edward Lemur45768512020-03-02 19:03:14 +0000488 jobs = []
489 for (project, bucket, builder), builds in grouped.items():
490 if 'triggered' in builder:
491 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
492 'from a parent. Please schedule a manual job for the parent '
493 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000494 continue
495 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
496 # Don't retry if any are running.
497 continue
Edward Lemur45768512020-03-02 19:03:14 +0000498 # If builder had several builds, retry only if the last one failed.
499 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
500 # build, but in case of retrying failed jobs retrying a flaky one makes
501 # sense.
502 builds = sorted(builds, key=lambda b: b['createTime'])
503 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
504 continue
505 # Don't retry experimental build previously triggered by CQ.
506 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
507 for t in builds[-1]['tags']):
508 continue
509 jobs.append((project, bucket, builder))
510
511 # Sort the jobs to make testing easier.
512 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000513
514
Quinten Yearsley777660f2020-03-04 23:37:06 +0000515def _print_tryjobs(options, builds):
516 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000517 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000518 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519 return
520
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 longest_builder = max(len(b['builder']['builder']) for b in builds)
522 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
525 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000527 builds_by_status = {}
528 for b in builds:
529 builds_by_status.setdefault(b['status'], []).append({
530 'id': b['id'],
531 'name': name_fmt.format(
532 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
533 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 sort_key = lambda b: (b['name'], b['id'])
536
537 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 if not builds:
540 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000543 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000544 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 else:
546 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
547
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 print(colorize(title))
549 for b in sorted(builds, key=sort_key):
550 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551
552 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000553 print_builds(
554 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
555 print_builds(
556 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
557 color=Fore.MAGENTA)
558 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
559 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
560 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000561 print_builds('Started:', builds_by_status.pop('STARTED', []),
562 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 print_builds(
564 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 print_builds(
567 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000568 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
570
Aiden Bennerc08566e2018-10-03 17:52:42 +0000571def _ComputeDiffLineRanges(files, upstream_commit):
572 """Gets the changed line ranges for each file since upstream_commit.
573
574 Parses a git diff on provided files and returns a dict that maps a file name
575 to an ordered list of range tuples in the form (start_line, count).
576 Ranges are in the same format as a git diff.
577 """
578 # If files is empty then diff_output will be a full diff.
579 if len(files) == 0:
580 return {}
581
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000582 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000583 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000584 diff_output = RunGit(diff_cmd)
585
586 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
587 # 2 capture groups
588 # 0 == fname of diff file
589 # 1 == 'diff_start,diff_count' or 'diff_start'
590 # will match each of
591 # diff --git a/foo.foo b/foo.py
592 # @@ -12,2 +14,3 @@
593 # @@ -12,2 +17 @@
594 # running re.findall on the above string with pattern will give
595 # [('foo.py', ''), ('', '14,3'), ('', '17')]
596
597 curr_file = None
598 line_diffs = {}
599 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
600 if match[0] != '':
601 # Will match the second filename in diff --git a/a.py b/b.py.
602 curr_file = match[0]
603 line_diffs[curr_file] = []
604 else:
605 # Matches +14,3
606 if ',' in match[1]:
607 diff_start, diff_count = match[1].split(',')
608 else:
609 # Single line changes are of the form +12 instead of +12,1.
610 diff_start = match[1]
611 diff_count = 1
612
613 diff_start = int(diff_start)
614 diff_count = int(diff_count)
615
616 # If diff_count == 0 this is a removal we can ignore.
617 line_diffs[curr_file].append((diff_start, diff_count))
618
619 return line_diffs
620
621
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 """Checks if a yapf file is in any parent directory of fpath until top_dir.
624
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000625 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000626 is found returns None. Uses yapf_config_cache as a cache for previously found
627 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000628 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000629 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 # Return result if we've already computed it.
631 if fpath in yapf_config_cache:
632 return yapf_config_cache[fpath]
633
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000634 parent_dir = os.path.dirname(fpath)
635 if os.path.isfile(fpath):
636 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000638 # Otherwise fpath is a directory
639 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
640 if os.path.isfile(yapf_file):
641 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000642 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000643 # If we're at the top level directory, or if we're at root
644 # there is no provided style.
645 ret = None
646 else:
647 # Otherwise recurse on the current directory.
648 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000649 yapf_config_cache[fpath] = ret
650 return ret
651
652
Brian Sheedyb4307d52019-12-02 19:18:17 +0000653def _GetYapfIgnorePatterns(top_dir):
654 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000655
656 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
657 but this functionality appears to break when explicitly passing files to
658 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000659 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000660 the .yapfignore file should be in the directory that yapf is invoked from,
661 which we assume to be the top level directory in this case.
662
663 Args:
664 top_dir: The top level directory for the repository being formatted.
665
666 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000668 """
669 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000670 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000671 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000672 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000673
Anthony Politoc64e3902021-04-30 21:55:25 +0000674 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
675 stripped_line = line.strip()
676 # Comments and blank lines should be ignored.
677 if stripped_line.startswith('#') or stripped_line == '':
678 continue
679 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000680 return ignore_patterns
681
682
683def _FilterYapfIgnoredFiles(filepaths, patterns):
684 """Filters out any filepaths that match any of the given patterns.
685
686 Args:
687 filepaths: An iterable of strings containing filepaths to filter.
688 patterns: An iterable of strings containing fnmatch patterns to filter on.
689
690 Returns:
691 A list of strings containing all the elements of |filepaths| that did not
692 match any of the patterns in |patterns|.
693 """
694 # Not inlined so that tests can use the same implementation.
695 return [f for f in filepaths
696 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000697
698
Aaron Gable13101a62018-02-09 13:20:41 -0800699def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 """Prints statistics about the change to the user."""
701 # --no-ext-diff is broken in some versions of Git, so try to work around
702 # this by overriding the environment (but there is still a problem if the
703 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000704 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705 if 'GIT_EXTERNAL_DIFF' in env:
706 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000707
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000708 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800709 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000710 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000711
712
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000713class BuildbucketResponseException(Exception):
714 pass
715
716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000717class Settings(object):
718 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000719 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000720 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000721 self.tree_status_url = None
722 self.viewvc_url = None
723 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000724 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000725 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000726 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000727 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000728 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000729 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000730
Edward Lemur26964072020-02-19 19:18:51 +0000731 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000732 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000733 if self.updated:
734 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000735
Edward Lemur26964072020-02-19 19:18:51 +0000736 # The only value that actually changes the behavior is
737 # autoupdate = "false". Everything else means "true".
738 autoupdate = (
739 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
740
741 cr_settings_file = FindCodereviewSettingsFile()
742 if autoupdate != 'false' and cr_settings_file:
743 LoadCodereviewSettingsFromFile(cr_settings_file)
744 cr_settings_file.close()
745
746 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000747
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000748 @staticmethod
749 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000750 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000751
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000753 if self.root is None:
754 self.root = os.path.abspath(self.GetRelativeRoot())
755 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 def GetTreeStatusUrl(self, error_ok=False):
758 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000759 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
760 if self.tree_status_url is None and not error_ok:
761 DieWithError(
762 'You must configure your tree status URL by running '
763 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 return self.tree_status_url
765
766 def GetViewVCUrl(self):
767 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000768 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 return self.viewvc_url
770
rmistry@google.com90752582014-01-14 21:04:50 +0000771 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000772 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000773
rmistry@google.com5626a922015-02-26 14:03:30 +0000774 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000775 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000776 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000777 return run_post_upload_hook == "True"
778
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000779 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000780 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000781
Dirk Pranke6f0df682021-06-25 00:42:33 +0000782 def GetUsePython3(self):
783 return self._GetConfig('rietveld.use-python3')
784
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000785 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000786 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000787 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000788 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
789 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000790 # Default is squash now (http://crbug.com/611892#c23).
791 self.squash_gerrit_uploads = self._GetConfig(
792 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000793 return self.squash_gerrit_uploads
794
Edward Lesmes4de54132020-05-05 19:41:33 +0000795 def GetSquashGerritUploadsOverride(self):
796 """Return True or False if codereview.settings should be overridden.
797
798 Returns None if no override has been defined.
799 """
800 # See also http://crbug.com/611892#c23
801 result = self._GetConfig('gerrit.override-squash-uploads').lower()
802 if result == 'true':
803 return True
804 if result == 'false':
805 return False
806 return None
807
tandrii@chromium.org28253532016-04-14 13:46:56 +0000808 def GetGerritSkipEnsureAuthenticated(self):
809 """Return True if EnsureAuthenticated should not be done for Gerrit
810 uploads."""
811 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.gerrit_skip_ensure_authenticated = self._GetConfig(
813 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000814 return self.gerrit_skip_ensure_authenticated
815
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000816 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000817 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000818 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000819 # Git requires single quotes for paths with spaces. We need to replace
820 # them with double quotes for Windows to treat such paths as a single
821 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000822 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000823 return self.git_editor or None
824
thestig@chromium.org44202a22014-03-11 19:22:18 +0000825 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000826 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000827
828 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000829 return self._GetConfig(
830 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000831
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000832 def GetFormatFullByDefault(self):
833 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000834 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000835 result = (
836 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
837 error_ok=True).strip())
838 self.format_full_by_default = (result == 'true')
839 return self.format_full_by_default
840
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000841 def IsStatusCommitOrderByDate(self):
842 if self.is_status_commit_order_by_date is None:
843 result = (RunGit(['config', '--bool', 'cl.date-order'],
844 error_ok=True).strip())
845 self.is_status_commit_order_by_date = (result == 'true')
846 return self.is_status_commit_order_by_date
847
Edward Lemur26964072020-02-19 19:18:51 +0000848 def _GetConfig(self, key, default=''):
849 self._LazyUpdateIfNeeded()
850 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000851
852
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000853class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000854 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000855 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000856 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000857 DRY_RUN = 'dry_run'
858 COMMIT = 'commit'
859
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000860 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000861
862
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000863class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000864 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000865 self.issue = issue
866 self.patchset = patchset
867 self.hostname = hostname
868
869 @property
870 def valid(self):
871 return self.issue is not None
872
873
Edward Lemurf38bc172019-09-03 21:02:13 +0000874def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000875 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
876 fail_result = _ParsedIssueNumberArgument()
877
Edward Lemur678a6842019-10-03 22:25:05 +0000878 if isinstance(arg, int):
879 return _ParsedIssueNumberArgument(issue=arg)
880 if not isinstance(arg, basestring):
881 return fail_result
882
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000883 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000884 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700885
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000886 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000887 if not url.startswith('http'):
888 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000889 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
890 if url.startswith(short_url):
891 url = gerrit_url + url[len(short_url):]
892 break
893
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000894 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000895 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000896 except ValueError:
897 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200898
Alex Turner30ae6372022-01-04 02:32:52 +0000899 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
900 # URL.
901 if not arg.startswith('http') and '.' not in parsed_url.netloc:
902 return fail_result
903
Edward Lemur678a6842019-10-03 22:25:05 +0000904 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
905 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
906 # Short urls like https://domain/<issue_number> can be used, but don't allow
907 # specifying the patchset (you'd 404), but we allow that here.
908 if parsed_url.path == '/':
909 part = parsed_url.fragment
910 else:
911 part = parsed_url.path
912
913 match = re.match(
914 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
915 if not match:
916 return fail_result
917
918 issue = int(match.group('issue'))
919 patchset = match.group('patchset')
920 return _ParsedIssueNumberArgument(
921 issue=issue,
922 patchset=int(patchset) if patchset else None,
923 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924
925
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000926def _create_description_from_log(args):
927 """Pulls out the commit log to use as a base for the CL description."""
928 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000929 if len(args) == 1 and args[0] == None:
930 # Handle the case where None is passed as the branch.
931 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000932 if len(args) == 1 and not args[0].endswith('.'):
933 log_args = [args[0] + '..']
934 elif len(args) == 1 and args[0].endswith('...'):
935 log_args = [args[0][:-1]]
936 elif len(args) == 2:
937 log_args = [args[0] + '..' + args[1]]
938 else:
939 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000940 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000941
942
Aaron Gablea45ee112016-11-22 15:14:38 -0800943class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700944 def __init__(self, issue, url):
945 self.issue = issue
946 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800947 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700948
949 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800950 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700951 self.issue, self.url)
952
953
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100954_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000955 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100956 # TODO(tandrii): these two aren't known in Gerrit.
957 'approval', 'disapproval'])
958
959
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000960class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000961 """Changelist works with one changelist in local branch.
962
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000963 Notes:
964 * Not safe for concurrent multi-{thread,process} use.
965 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700966 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000967 """
968
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000969 def __init__(self,
970 branchref=None,
971 issue=None,
972 codereview_host=None,
973 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000974 """Create a new ChangeList instance.
975
Edward Lemurf38bc172019-09-03 21:02:13 +0000976 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000977 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000978 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000979 global settings
980 if not settings:
981 # Happens when git_cl.py is used as a utility library.
982 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000983
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000984 self.branchref = branchref
985 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000986 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000987 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988 else:
989 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000990 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000991 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000992 self.lookedup_issue = False
993 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000995 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000996 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000997 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800998 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000999 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001000 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001001
Edward Lemur125d60a2019-09-13 18:25:41 +00001002 # Lazily cached values.
1003 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1004 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001005 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001006 # Map from change number (issue) to its detail cache.
1007 self._detail_cache = {}
1008
1009 if codereview_host is not None:
1010 assert not codereview_host.startswith('https://'), codereview_host
1011 self._gerrit_host = codereview_host
1012 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001013
Edward Lesmese1576912021-02-16 21:53:34 +00001014 @property
1015 def owners_client(self):
1016 if self._owners_client is None:
1017 remote, remote_branch = self.GetRemoteBranch()
1018 branch = GetTargetRef(remote, remote_branch, None)
1019 self._owners_client = owners_client.GetCodeOwnersClient(
1020 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001021 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001022 host=self.GetGerritHost(),
1023 project=self.GetGerritProject(),
1024 branch=branch)
1025 return self._owners_client
1026
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001027 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001028 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001029
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001030 The return value is a string suitable for passing to git cl with the --cc
1031 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001032 """
1033 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001034 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001035 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001036 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1037 return self.cc
1038
Daniel Cheng7227d212017-11-17 08:12:37 -08001039 def ExtendCC(self, more_cc):
1040 """Extends the list of users to cc on this CL based on the changed files."""
1041 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001043 def GetCommitDate(self):
1044 """Returns the commit date as provided in the constructor"""
1045 return self.commit_date
1046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001048 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001050 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001051 if not branchref:
1052 return None
1053 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001054 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 return self.branch
1056
1057 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001058 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.GetBranch() # Poke the lazy loader.
1060 return self.branchref
1061
Edward Lemur85153282020-02-14 22:06:29 +00001062 def _GitGetBranchConfigValue(self, key, default=None):
1063 return scm.GIT.GetBranchConfig(
1064 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001065
Edward Lemur85153282020-02-14 22:06:29 +00001066 def _GitSetBranchConfigValue(self, key, value):
1067 action = 'set %s to %r' % (key, value)
1068 if not value:
1069 action = 'unset %s' % key
1070 assert self.GetBranch(), 'a branch is needed to ' + action
1071 return scm.GIT.SetBranchConfig(
1072 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001073
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001074 @staticmethod
1075 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001076 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001077 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001078 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001079 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1080 settings.GetRoot(), branch)
1081 if not remote or not upstream_branch:
1082 DieWithError(
1083 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001084 'Verify this branch is set up to track another \n'
1085 '(via the --track argument to "git checkout -b ..."). \n'
1086 'or pass complete "git diff"-style arguments if supported, like\n'
1087 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088
1089 return remote, upstream_branch
1090
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001091 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001092 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001093 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001094 DieWithError('The upstream for the current branch (%s) does not exist '
1095 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001096 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001097 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 def GetUpstreamBranch(self):
1100 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001101 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001102 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001103 upstream_branch = upstream_branch.replace('refs/heads/',
1104 'refs/remotes/%s/' % remote)
1105 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1106 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 self.upstream_branch = upstream_branch
1108 return self.upstream_branch
1109
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001110 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001111 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 remote, branch = None, self.GetBranch()
1113 seen_branches = set()
1114 while branch not in seen_branches:
1115 seen_branches.add(branch)
1116 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001117 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001118 if remote != '.' or branch.startswith('refs/remotes'):
1119 break
1120 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001121 remotes = RunGit(['remote'], error_ok=True).split()
1122 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001123 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001124 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001126 logging.warning('Could not determine which remote this change is '
1127 'associated with, so defaulting to "%s".' %
1128 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001129 else:
Gavin Make6a62332020-12-04 21:57:10 +00001130 logging.warning('Could not determine which remote this change is '
1131 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001132 branch = 'HEAD'
1133 if branch.startswith('refs/remotes'):
1134 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001135 elif branch.startswith('refs/branch-heads/'):
1136 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001137 else:
1138 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001139 return self._remote
1140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 def GetRemoteUrl(self):
1142 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1143
1144 Returns None if there is no remote.
1145 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001146 is_cached, value = self._cached_remote_url
1147 if is_cached:
1148 return value
1149
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001151 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001152
Edward Lemur298f2cf2019-02-22 21:40:39 +00001153 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001154 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001155 if host:
1156 self._cached_remote_url = (True, url)
1157 return url
1158
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001159 # If it cannot be parsed as an url, assume it is a local directory,
1160 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001161 logging.warning('"%s" doesn\'t appear to point to a git host. '
1162 'Interpreting it as a local directory.', url)
1163 if not os.path.isdir(url):
1164 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001165 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1166 'but it doesn\'t exist.',
1167 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001168 return None
1169
1170 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001171 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001172
Edward Lemur79d4f992019-11-11 23:49:02 +00001173 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001174 if not host:
1175 logging.error(
1176 'Remote "%(remote)s" for branch "%(branch)s" points to '
1177 '"%(cache_path)s", but it is misconfigured.\n'
1178 '"%(cache_path)s" must be a git repo and must have a remote named '
1179 '"%(remote)s" pointing to the git host.', {
1180 'remote': remote,
1181 'cache_path': cache_path,
1182 'branch': self.GetBranch()})
1183 return None
1184
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001185 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001186 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001188 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001189 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001190 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001191 if self.GetBranch():
1192 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001193 if self.issue is not None:
1194 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001195 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 return self.issue
1197
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001198 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001199 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001200 issue = self.GetIssue()
1201 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001202 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001203 server = self.GetCodereviewServer()
1204 if short:
1205 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1206 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207
Dirk Pranke6f0df682021-06-25 00:42:33 +00001208 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001209 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001210
Edward Lemur6c6827c2020-02-06 21:15:18 +00001211 def FetchDescription(self, pretty=False):
1212 assert self.GetIssue(), 'issue is required to query Gerrit'
1213
Edward Lemur9aa1a962020-02-25 00:58:38 +00001214 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001215 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1216 current_rev = data['current_revision']
1217 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001218
1219 if not pretty:
1220 return self.description
1221
1222 # Set width to 72 columns + 2 space indent.
1223 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1224 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1225 lines = self.description.splitlines()
1226 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227
1228 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001229 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001230 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001231 if self.GetBranch():
1232 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001233 if self.patchset is not None:
1234 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001235 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236 return self.patchset
1237
Edward Lemur9aa1a962020-02-25 00:58:38 +00001238 def GetAuthor(self):
1239 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1240
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001242 """Set this branch's patchset. If patchset=0, clears the patchset."""
1243 assert self.GetBranch()
1244 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001246 else:
1247 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001248 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001250 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001251 """Set this branch's issue. If issue isn't given, clears the issue."""
1252 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001254 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001255 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001257 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001258 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001259 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001260 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 else:
tandrii5d48c322016-08-18 16:19:37 -07001262 # Reset all of these just to be clean.
1263 reset_suffixes = [
1264 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001265 ISSUE_CONFIG_KEY,
1266 PATCHSET_CONFIG_KEY,
1267 CODEREVIEW_SERVER_CONFIG_KEY,
1268 'gerritsquashhash',
1269 ]
tandrii5d48c322016-08-18 16:19:37 -07001270 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001271 try:
1272 self._GitSetBranchConfigValue(prop, None)
1273 except subprocess2.CalledProcessError:
1274 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001275 msg = RunGit(['log', '-1', '--format=%B']).strip()
1276 if msg and git_footers.get_footer_change_id(msg):
1277 print('WARNING: The change patched into this branch has a Change-Id. '
1278 'Removing it.')
1279 RunGit(['commit', '--amend', '-m',
1280 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001281 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001282 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001283 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
Edward Lemur2c62b332020-03-12 22:12:33 +00001285 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001286 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001287 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001288 except subprocess2.CalledProcessError:
1289 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001290 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001291 'This branch probably doesn\'t exist anymore. To reset the\n'
1292 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001293 ' git branch --set-upstream-to origin/main %s\n'
1294 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001295 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001296
dsansomee2d6fd92016-09-08 00:10:47 -07001297 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001298 assert self.GetIssue(), 'issue is required to update description'
1299
1300 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001301 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001302 if not force:
1303 confirm_or_exit(
1304 'The description cannot be modified while the issue has a pending '
1305 'unpublished edit. Either publish the edit in the Gerrit web UI '
1306 'or delete it.\n\n', action='delete the unpublished edit')
1307
1308 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001309 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001310 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001311 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001312 description, notify='NONE')
1313
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001314 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001315
Edward Lemur75526302020-02-27 22:31:05 +00001316 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001317 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001318 '--root', settings.GetRoot(),
1319 '--upstream', upstream,
1320 ]
1321
1322 args.extend(['--verbose'] * verbose)
1323
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001324 remote, remote_branch = self.GetRemoteBranch()
1325 target_ref = GetTargetRef(remote, remote_branch, None)
1326 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1327 args.extend(['--gerrit_project', self.GetGerritProject()])
1328 args.extend(['--gerrit_branch', target_ref])
1329
Edward Lemur99df04e2020-03-05 19:39:43 +00001330 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001331 issue = self.GetIssue()
1332 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001333 if author:
1334 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001335 if issue:
1336 args.extend(['--issue', str(issue)])
1337 if patchset:
1338 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001339
Edward Lemur75526302020-02-27 22:31:05 +00001340 return args
1341
Josip Sokcevic017544d2022-03-31 23:47:53 +00001342 def RunHook(self,
1343 committing,
1344 may_prompt,
1345 verbose,
1346 parallel,
1347 upstream,
1348 description,
1349 all_files,
1350 files=None,
1351 resultdb=False,
1352 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001353 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1354 args = self._GetCommonPresubmitArgs(verbose, upstream)
1355 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001356 if may_prompt:
1357 args.append('--may_prompt')
1358 if parallel:
1359 args.append('--parallel')
1360 if all_files:
1361 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001362 if files:
1363 args.extend(files.split(';'))
1364 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001365 if files or all_files:
1366 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001367
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001368 if resultdb and not realm:
1369 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1370 # it is not required to pass the realm flag
1371 print('Note: ResultDB reporting will NOT be performed because --realm'
1372 ' was not specified. To enable ResultDB, please run the command'
1373 ' again with the --realm argument to specify the LUCI realm.')
1374
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001375 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1376 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001377 if py3_results.get('skipped_presubmits', 1) == 0:
1378 print('No more presubmits to run - skipping Python 2 presubmits.')
1379 return py3_results
1380
1381 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1382 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001383 return self._MergePresubmitResults(py2_results, py3_results)
1384
1385 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1386 args = args[:]
1387 vpython = 'vpython3' if use_python3 else 'vpython'
1388
Edward Lemur227d5102020-02-25 23:45:35 +00001389 with gclient_utils.temporary_file() as description_file:
1390 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001391 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001392 args.extend(['--json_output', json_output])
1393 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001394 if self.GetUsePython3():
1395 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001396 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001397 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001398 if resultdb and realm:
1399 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001400
1401 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001402 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001403
Edward Lemur227d5102020-02-25 23:45:35 +00001404 metrics.collector.add_repeated('sub_commands', {
1405 'command': 'presubmit',
1406 'execution_time': time_time() - start,
1407 'exit_code': exit_code,
1408 })
1409
1410 if exit_code:
1411 sys.exit(exit_code)
1412
1413 json_results = gclient_utils.FileRead(json_output)
1414 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001415
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001416 def _MergePresubmitResults(self, py2_results, py3_results):
1417 return {
1418 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1419 py3_results.get('more_cc', []))),
1420 'errors': (
1421 py2_results.get('errors', []) + py3_results.get('errors', [])),
1422 'notifications': (
1423 py2_results.get('notifications', []) +
1424 py3_results.get('notifications', [])),
1425 'warnings': (
1426 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1427 }
1428
Edward Lemur75526302020-02-27 22:31:05 +00001429 def RunPostUploadHook(self, verbose, upstream, description):
1430 args = self._GetCommonPresubmitArgs(verbose, upstream)
1431 args.append('--post_upload')
1432
1433 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001434 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001435 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001436 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1437 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1438 ['--use-python3'])
1439 p_py2.wait()
1440 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001441
Edward Lemur5a644f82020-03-18 16:44:57 +00001442 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1443 # Get description message for upload.
1444 if self.GetIssue():
1445 description = self.FetchDescription()
1446 elif options.message:
1447 description = options.message
1448 else:
1449 description = _create_description_from_log(git_diff_args)
1450 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001451 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001452
Edward Lemur5a644f82020-03-18 16:44:57 +00001453 bug = options.bug
1454 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001455 if not self.GetIssue():
1456 # Extract bug number from branch name, but only if issue is being created.
1457 # It must start with bug or fix, followed by _ or - and number.
1458 # Optionally, it may contain _ or - after number with arbitrary text.
1459 # Examples:
1460 # bug-123
1461 # bug_123
1462 # fix-123
1463 # fix-123-some-description
1464 match = re.match(
1465 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1466 self.GetBranch())
1467 if not bug and not fixed and match:
1468 if match.group('type') == 'bug':
1469 bug = match.group('bugnum')
1470 else:
1471 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001472
1473 change_description = ChangeDescription(description, bug, fixed)
1474
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001475 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1476 if options.add_owners_to:
1477 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001478 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001479 files, [], options.tbrs + options.reviewers)
1480 missing_files = [
1481 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001482 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001483 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001484 owners = self.owners_client.SuggestOwners(
1485 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001486 if options.add_owners_to == 'TBR':
1487 assert isinstance(options.tbrs, list), options.tbrs
1488 options.tbrs.extend(owners)
1489 else:
1490 assert isinstance(options.reviewers, list), options.reviewers
1491 options.reviewers.extend(owners)
1492
Edward Lemur5a644f82020-03-18 16:44:57 +00001493 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001494 if options.reviewers or options.tbrs:
1495 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001496
1497 return change_description
1498
1499 def _GetTitleForUpload(self, options):
1500 # When not squashing, just return options.title.
1501 if not options.squash:
1502 return options.title
1503
1504 # On first upload, patchset title is always this string, while options.title
1505 # gets converted to first line of message.
1506 if not self.GetIssue():
1507 return 'Initial upload'
1508
1509 # When uploading subsequent patchsets, options.message is taken as the title
1510 # if options.title is not provided.
1511 if options.title:
1512 return options.title
1513 if options.message:
1514 return options.message.strip()
1515
1516 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001517 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001518 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001519 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001520 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001521
1522 # Use the default title if the user confirms the default with a 'y'.
1523 if user_title.lower() == 'y':
1524 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001525 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001526
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001527 def CMDUpload(self, options, git_diff_args, orig_args):
1528 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001529 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001530 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001531 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001532 else:
1533 if self.GetBranch() is None:
1534 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1535
1536 # Default to diffing against common ancestor of upstream branch
1537 base_branch = self.GetCommonAncestorWithUpstream()
1538 git_diff_args = [base_branch, 'HEAD']
1539
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001540 # Fast best-effort checks to abort before running potentially expensive
1541 # hooks if uploading is likely to fail anyway. Passing these checks does
1542 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001543 self.EnsureAuthenticated(force=options.force)
1544 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545
1546 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001547 watchlist = watchlists.Watchlists(settings.GetRoot())
1548 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001550 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001551
Edward Lemur5a644f82020-03-18 16:44:57 +00001552 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001554 hook_results = self.RunHook(
1555 committing=False,
1556 may_prompt=not options.force,
1557 verbose=options.verbose,
1558 parallel=options.parallel,
1559 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001560 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001561 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001562 resultdb=options.resultdb,
1563 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001564 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001565
Aaron Gable13101a62018-02-09 13:20:41 -08001566 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001567 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001568 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001570 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001571 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572 # Run post upload hooks, if specified.
1573 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001574 self.RunPostUploadHook(
1575 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576
1577 # Upload all dependencies if specified.
1578 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001579 print()
1580 print('--dependencies has been specified.')
1581 print('All dependent local branches will be re-uploaded.')
1582 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583 # Remove the dependencies flag from args so that we do not end up in a
1584 # loop.
1585 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001586 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 return ret
1588
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001589 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001590 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001591
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001592 Issue must have been already uploaded and known. Optionally allows for
1593 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001594 """
1595 assert new_state in _CQState.ALL_STATES
1596 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001597 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001598 vote_map = {
1599 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001600 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001601 _CQState.DRY_RUN: 1,
1602 _CQState.COMMIT: 2,
1603 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001604 if new_state == _CQState.QUICK_RUN:
1605 labels = {
1606 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1607 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1608 }
1609 else:
1610 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001611 notify = False if new_state == _CQState.DRY_RUN else None
1612 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001613 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001614 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001615 return 0
1616 except KeyboardInterrupt:
1617 raise
1618 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001619 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001620 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001621 ' * Your project has no CQ,\n'
1622 ' * You don\'t have permission to change the CQ state,\n'
1623 ' * There\'s a bug in this code (see stack trace below).\n'
1624 'Consider specifying which bots to trigger manually or asking your '
1625 'project owners for permissions or contacting Chrome Infra at:\n'
1626 'https://www.chromium.org/infra\n\n' %
1627 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001628 # Still raise exception so that stack trace is printed.
1629 raise
1630
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001631 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001632 # Lazy load of configs.
1633 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001634 if self._gerrit_host and '.' not in self._gerrit_host:
1635 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1636 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001637 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001638 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001639 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001640 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001641 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1642 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001643 return self._gerrit_host
1644
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001645 def _GetGitHost(self):
1646 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001647 remote_url = self.GetRemoteUrl()
1648 if not remote_url:
1649 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001650 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001651
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001652 def GetCodereviewServer(self):
1653 if not self._gerrit_server:
1654 # If we're on a branch then get the server potentially associated
1655 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001656 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001657 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001658 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001659 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001660 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001661 if not self._gerrit_server:
1662 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1663 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001664 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001665 parts[0] = parts[0] + '-review'
1666 self._gerrit_host = '.'.join(parts)
1667 self._gerrit_server = 'https://%s' % self._gerrit_host
1668 return self._gerrit_server
1669
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001670 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001671 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001672 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001673 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001674 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001675 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001676 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001677 if project.endswith('.git'):
1678 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001679 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1680 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1681 # gitiles/git-over-https protocol. E.g.,
1682 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1683 # as
1684 # https://chromium.googlesource.com/v8/v8
1685 if project.startswith('a/'):
1686 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001687 return project
1688
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001689 def _GerritChangeIdentifier(self):
1690 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1691
1692 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001693 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001694 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001695 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001696 if project:
1697 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1698 # Fall back on still unique, but less efficient change number.
1699 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001700
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001701 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001702 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001703 if settings.GetGerritSkipEnsureAuthenticated():
1704 # For projects with unusual authentication schemes.
1705 # See http://crbug.com/603378.
1706 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001707
1708 # Check presence of cookies only if using cookies-based auth method.
1709 cookie_auth = gerrit_util.Authenticator.get()
1710 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001711 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001712
Florian Mayerae510e82020-01-30 21:04:48 +00001713 remote_url = self.GetRemoteUrl()
1714 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001715 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001716 return
1717 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001718 logging.warning('Ignoring branch %(branch)s with non-https remote '
1719 '%(remote)s', {
1720 'branch': self.branch,
1721 'remote': self.GetRemoteUrl()
1722 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001723 return
1724
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001725 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001726 self.GetCodereviewServer()
1727 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001728 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001729
1730 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1731 git_auth = cookie_auth.get_auth_header(git_host)
1732 if gerrit_auth and git_auth:
1733 if gerrit_auth == git_auth:
1734 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001735 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001736 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001737 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001738 ' %s\n'
1739 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001740 ' Consider running the following command:\n'
1741 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001742 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001743 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001744 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001745 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001746 cookie_auth.get_new_password_message(git_host)))
1747 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001748 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001749 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001750
1751 missing = (
1752 ([] if gerrit_auth else [self._gerrit_host]) +
1753 ([] if git_auth else [git_host]))
1754 DieWithError('Credentials for the following hosts are required:\n'
1755 ' %s\n'
1756 'These are read from %s (or legacy %s)\n'
1757 '%s' % (
1758 '\n '.join(missing),
1759 cookie_auth.get_gitcookies_path(),
1760 cookie_auth.get_netrc_path(),
1761 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001762
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001763 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001764 if not self.GetIssue():
1765 return
1766
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001767 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001768 if status == 'ABANDONED':
1769 DieWithError(
1770 'Change %s has been abandoned, new uploads are not allowed' %
1771 (self.GetIssueURL()))
1772 if status == 'MERGED':
1773 answer = gclient_utils.AskForData(
1774 'Change %s has been submitted, new uploads are not allowed. '
1775 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1776 ).lower()
1777 if answer not in ('y', ''):
1778 DieWithError('New uploads are not allowed.')
1779 self.SetIssue()
1780 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001781
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001782 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1783 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1784 # Apparently this check is not very important? Otherwise get_auth_email
1785 # could have been added to other implementations of Authenticator.
1786 cookies_auth = gerrit_util.Authenticator.get()
1787 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001788 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001789
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001790 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001791 if self.GetIssueOwner() == cookies_user:
1792 return
1793 logging.debug('change %s owner is %s, cookies user is %s',
1794 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001795 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001796 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001797 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001798 if details['email'] == self.GetIssueOwner():
1799 return
1800 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001801 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001802 'as %s.\n'
1803 'Uploading may fail due to lack of permissions.' %
1804 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1805 confirm_or_exit(action='upload')
1806
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001808 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001809 or CQ status, assuming adherence to a common workflow.
1810
1811 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001812 * 'error' - error from review tool (including deleted issues)
1813 * 'unsent' - no reviewers added
1814 * 'waiting' - waiting for review
1815 * 'reply' - waiting for uploader to reply to review
1816 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001817 * 'dry-run' - dry-running in the CQ
1818 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001820 """
1821 if not self.GetIssue():
1822 return None
1823
1824 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001825 data = self._GetChangeDetail([
1826 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001827 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001828 return 'error'
1829
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001830 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001831 return 'closed'
1832
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001833 cq_label = data['labels'].get('Commit-Queue', {})
1834 max_cq_vote = 0
1835 for vote in cq_label.get('all', []):
1836 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1837 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001838 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001839 if max_cq_vote == 1:
1840 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001841
Aaron Gable9ab38c62017-04-06 14:36:33 -07001842 if data['labels'].get('Code-Review', {}).get('approved'):
1843 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001844
1845 if not data.get('reviewers', {}).get('REVIEWER', []):
1846 return 'unsent'
1847
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001848 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001849 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001850 while messages:
1851 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001852 if (m.get('tag', '').startswith('autogenerated:cq') or
1853 m.get('tag', '').startswith('autogenerated:cv')):
1854 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001855 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001856 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001857 # Most recent message was by owner.
1858 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001859
1860 # Some reply from non-owner.
1861 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001862
1863 # Somehow there are no messages even though there are reviewers.
1864 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001865
1866 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001867 if not self.GetIssue():
1868 return None
1869
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001870 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001871 patchset = data['revisions'][data['current_revision']]['_number']
1872 self.SetPatchset(patchset)
1873 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001874
Gavin Make61ccc52020-11-13 00:12:57 +00001875 def GetMostRecentDryRunPatchset(self):
1876 """Get patchsets equivalent to the most recent patchset and return
1877 the patchset with the latest dry run. If none have been dry run, return
1878 the latest patchset."""
1879 if not self.GetIssue():
1880 return None
1881
1882 data = self._GetChangeDetail(['ALL_REVISIONS'])
1883 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001884 dry_run = {int(m['_revision_number'])
1885 for m in data.get('messages', [])
1886 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001887
1888 for revision_info in sorted(data.get('revisions', {}).values(),
1889 key=lambda c: c['_number'], reverse=True):
1890 if revision_info['_number'] in dry_run:
1891 patchset = revision_info['_number']
1892 break
1893 if revision_info.get('kind', '') not in \
1894 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1895 break
1896 self.SetPatchset(patchset)
1897 return patchset
1898
Aaron Gable636b13f2017-07-14 10:42:48 -07001899 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001900 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001901 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001902 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001903
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001904 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001905 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001906 # CURRENT_REVISION is included to get the latest patchset so that
1907 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001908 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001909 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1910 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001911 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001912 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001914 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001915
1916 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001917 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001919 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 line_comments = file_comments.setdefault(path, [])
1921 line_comments.extend(
1922 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001923
1924 # Build dictionary of file comments for easy access and sorting later.
1925 # {author+date: {path: {patchset: {line: url+message}}}}
1926 comments = collections.defaultdict(
1927 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001928
1929 server = self.GetCodereviewServer()
1930 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1931 # /c/ is automatically added by short URL server.
1932 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1933 self.GetIssue())
1934 else:
1935 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1936
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001937 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001938 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001939 tag = comment.get('tag', '')
1940 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001941 continue
1942 key = (comment['author']['email'], comment['updated'])
1943 if comment.get('side', 'REVISION') == 'PARENT':
1944 patchset = 'Base'
1945 else:
1946 patchset = 'PS%d' % comment['patch_set']
1947 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001948 url = ('%s/%s/%s#%s%s' %
1949 (url_prefix, comment['patch_set'], path,
1950 'b' if comment.get('side') == 'PARENT' else '',
1951 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001952 comments[key][path][patchset][line] = (url, comment['message'])
1953
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001954 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001955 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001956 summary = self._BuildCommentSummary(msg, comments, readable)
1957 if summary:
1958 summaries.append(summary)
1959 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001960
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001961 @staticmethod
1962 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001963 if 'email' not in msg['author']:
1964 # Some bot accounts may not have an email associated.
1965 return None
1966
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001967 key = (msg['author']['email'], msg['date'])
1968 # Don't bother showing autogenerated messages that don't have associated
1969 # file or line comments. this will filter out most autogenerated
1970 # messages, but will keep robot comments like those from Tricium.
1971 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1972 if is_autogenerated and not comments.get(key):
1973 return None
1974 message = msg['message']
1975 # Gerrit spits out nanoseconds.
1976 assert len(msg['date'].split('.')[-1]) == 9
1977 date = datetime.datetime.strptime(msg['date'][:-3],
1978 '%Y-%m-%d %H:%M:%S.%f')
1979 if key in comments:
1980 message += '\n'
1981 for path, patchsets in sorted(comments.get(key, {}).items()):
1982 if readable:
1983 message += '\n%s' % path
1984 for patchset, lines in sorted(patchsets.items()):
1985 for line, (url, content) in sorted(lines.items()):
1986 if line:
1987 line_str = 'Line %d' % line
1988 path_str = '%s:%d:' % (path, line)
1989 else:
1990 line_str = 'File comment'
1991 path_str = '%s:0:' % path
1992 if readable:
1993 message += '\n %s, %s: %s' % (patchset, line_str, url)
1994 message += '\n %s\n' % content
1995 else:
1996 message += '\n%s ' % path_str
1997 message += '\n%s\n' % content
1998
1999 return _CommentSummary(
2000 date=date,
2001 message=message,
2002 sender=msg['author']['email'],
2003 autogenerated=is_autogenerated,
2004 # These could be inferred from the text messages and correlated with
2005 # Code-Review label maximum, however this is not reliable.
2006 # Leaving as is until the need arises.
2007 approval=False,
2008 disapproval=False,
2009 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002010
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002011 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002012 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002013 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002014
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002015 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002016 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002017 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002018
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002019 def _GetChangeDetail(self, options=None):
2020 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002021 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002022 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002023
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002024 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002025 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002026 options.append('CURRENT_COMMIT')
2027
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002028 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002029 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002030 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002031
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002032 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2033 # Assumption: data fetched before with extra options is suitable
2034 # for return for a smaller set of options.
2035 # For example, if we cached data for
2036 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2037 # and request is for options=[CURRENT_REVISION],
2038 # THEN we can return prior cached data.
2039 if options_set.issubset(cached_options_set):
2040 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002041
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002042 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002043 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002044 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002045 except gerrit_util.GerritError as e:
2046 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002047 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002048 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002049
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002050 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002051 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002052
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002053 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002054 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002055 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002056 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002057 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002058 except gerrit_util.GerritError as e:
2059 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002060 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002061 raise
agable32978d92016-11-01 12:55:02 -07002062 return data
2063
Karen Qian40c19422019-03-13 21:28:29 +00002064 def _IsCqConfigured(self):
2065 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002066 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002067
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002068 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002069 if git_common.is_dirty_git_tree('land'):
2070 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002071
tandriid60367b2016-06-22 05:25:12 -07002072 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002073 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002074 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002075 'which can test and land changes for you. '
2076 'Are you sure you wish to bypass it?\n',
2077 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002078 differs = True
tandriic4344b52016-08-29 06:04:54 -07002079 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002080 # Note: git diff outputs nothing if there is no diff.
2081 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002082 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002083 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002084 if detail['current_revision'] == last_upload:
2085 differs = False
2086 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002087 print('WARNING: Local branch contents differ from latest uploaded '
2088 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002089 if differs:
2090 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002091 confirm_or_exit(
2092 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2093 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002094 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002095 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002096 upstream = self.GetCommonAncestorWithUpstream()
2097 if self.GetIssue():
2098 description = self.FetchDescription()
2099 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002100 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002101 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002102 committing=True,
2103 may_prompt=not force,
2104 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002105 parallel=parallel,
2106 upstream=upstream,
2107 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002108 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002109 resultdb=resultdb,
2110 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002111
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002112 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002113 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002114 links = self._GetChangeCommit().get('web_links', [])
2115 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002116 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002117 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002118 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002119 return 0
2120
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002121 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2122 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 assert parsed_issue_arg.valid
2124
Edward Lemur125d60a2019-09-13 18:25:41 +00002125 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002126
2127 if parsed_issue_arg.hostname:
2128 self._gerrit_host = parsed_issue_arg.hostname
2129 self._gerrit_server = 'https://%s' % self._gerrit_host
2130
tandriic2405f52016-10-10 08:13:15 -07002131 try:
2132 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002133 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002134 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002135
2136 if not parsed_issue_arg.patchset:
2137 # Use current revision by default.
2138 revision_info = detail['revisions'][detail['current_revision']]
2139 patchset = int(revision_info['_number'])
2140 else:
2141 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002142 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2144 break
2145 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002146 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 (parsed_issue_arg.patchset, self.GetIssue()))
2148
Edward Lemur125d60a2019-09-13 18:25:41 +00002149 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002150 if remote_url.endswith('.git'):
2151 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002152 remote_url = remote_url.rstrip('/')
2153
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002155 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002156
2157 if remote_url != fetch_info['url']:
2158 DieWithError('Trying to patch a change from %s but this repo appears '
2159 'to be %s.' % (fetch_info['url'], remote_url))
2160
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002162
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002163 # If we have created a new branch then do the "set issue" immediately in
2164 # case the cherry-pick fails, which happens when resolving conflicts.
2165 if newbranch:
2166 self.SetIssue(parsed_issue_arg.issue)
2167
Aaron Gable62619a32017-06-16 08:22:09 -07002168 if force:
2169 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2170 print('Checked out commit for change %i patchset %i locally' %
2171 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002172 elif nocommit:
2173 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2174 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002175 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002176 RunGit(['cherry-pick', 'FETCH_HEAD'])
2177 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002178 (parsed_issue_arg.issue, patchset))
2179 print('Note: this created a local commit which does not have '
2180 'the same hash as the one uploaded for review. This will make '
2181 'uploading changes based on top of this branch difficult.\n'
2182 'If you want to do that, use "git cl patch --force" instead.')
2183
Stefan Zagerd08043c2017-10-12 12:07:02 -07002184 if self.GetBranch():
2185 self.SetIssue(parsed_issue_arg.issue)
2186 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002187 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002188 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2189 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2190 else:
2191 print('WARNING: You are in detached HEAD state.\n'
2192 'The patch has been applied to your checkout, but you will not be '
2193 'able to upload a new patch set to the gerrit issue.\n'
2194 'Try using the \'-b\' option if you would like to work on a '
2195 'branch and/or upload a new patch set.')
2196
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 return 0
2198
tandrii16e0b4e2016-06-07 10:34:28 -07002199 def _GerritCommitMsgHookCheck(self, offer_removal):
2200 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2201 if not os.path.exists(hook):
2202 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002203 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2204 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002205 data = gclient_utils.FileRead(hook)
2206 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2207 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002208 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002209 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002210 'and may interfere with it in subtle ways.\n'
2211 'We recommend you remove the commit-msg hook.')
2212 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002213 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002214 gclient_utils.rm_file_or_tree(hook)
2215 print('Gerrit commit-msg hook removed.')
2216 else:
2217 print('OK, will keep Gerrit commit-msg hook in place.')
2218
Edward Lemur1b52d872019-05-09 21:12:12 +00002219 def _CleanUpOldTraces(self):
2220 """Keep only the last |MAX_TRACES| traces."""
2221 try:
2222 traces = sorted([
2223 os.path.join(TRACES_DIR, f)
2224 for f in os.listdir(TRACES_DIR)
2225 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2226 and not f.startswith('tmp'))
2227 ])
2228 traces_to_delete = traces[:-MAX_TRACES]
2229 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002230 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002231 except OSError:
2232 print('WARNING: Failed to remove old git traces from\n'
2233 ' %s'
2234 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002235
Edward Lemur5737f022019-05-17 01:24:00 +00002236 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002237 """Zip and write the git push traces stored in traces_dir."""
2238 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002239 traces_zip = trace_name + '-traces'
2240 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002241 # Create a temporary dir to store git config and gitcookies in. It will be
2242 # compressed and stored next to the traces.
2243 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002244 git_info_zip = trace_name + '-git-info'
2245
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002246 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002247
Edward Lemur1b52d872019-05-09 21:12:12 +00002248 git_push_metadata['trace_name'] = trace_name
2249 gclient_utils.FileWrite(
2250 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2251
2252 # Keep only the first 6 characters of the git hashes on the packet
2253 # trace. This greatly decreases size after compression.
2254 packet_traces = os.path.join(traces_dir, 'trace-packet')
2255 if os.path.isfile(packet_traces):
2256 contents = gclient_utils.FileRead(packet_traces)
2257 gclient_utils.FileWrite(
2258 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2259 shutil.make_archive(traces_zip, 'zip', traces_dir)
2260
2261 # Collect and compress the git config and gitcookies.
2262 git_config = RunGit(['config', '-l'])
2263 gclient_utils.FileWrite(
2264 os.path.join(git_info_dir, 'git-config'),
2265 git_config)
2266
2267 cookie_auth = gerrit_util.Authenticator.get()
2268 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2269 gitcookies_path = cookie_auth.get_gitcookies_path()
2270 if os.path.isfile(gitcookies_path):
2271 gitcookies = gclient_utils.FileRead(gitcookies_path)
2272 gclient_utils.FileWrite(
2273 os.path.join(git_info_dir, 'gitcookies'),
2274 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2275 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2276
Edward Lemur1b52d872019-05-09 21:12:12 +00002277 gclient_utils.rmtree(git_info_dir)
2278
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002279 def _RunGitPushWithTraces(self,
2280 refspec,
2281 refspec_opts,
2282 git_push_metadata,
2283 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002284 """Run git push and collect the traces resulting from the execution."""
2285 # Create a temporary directory to store traces in. Traces will be compressed
2286 # and stored in a 'traces' dir inside depot_tools.
2287 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002288 trace_name = os.path.join(
2289 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002290
2291 env = os.environ.copy()
2292 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2293 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002294 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002295 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2296 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2297 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2298
2299 try:
2300 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002301 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002302 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002303 push_cmd = ['git', 'push', remote_url, refspec]
2304 if git_push_options:
2305 for opt in git_push_options:
2306 push_cmd.extend(['-o', opt])
2307
Edward Lemur0f58ae42019-04-30 17:24:12 +00002308 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002309 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002310 env=env,
2311 print_stdout=True,
2312 # Flush after every line: useful for seeing progress when running as
2313 # recipe.
2314 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002315 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002316 except subprocess2.CalledProcessError as e:
2317 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002318 if 'blocked keyword' in str(e.stdout):
2319 raise GitPushError(
2320 'Failed to create a change, very likely due to blocked keyword. '
2321 'Please examine output above for the reason of the failure.\n'
2322 'If this is a false positive, you can try to bypass blocked '
2323 'keyword by using push option '
2324 '-o uploadvalidator~skip, e.g.:\n'
2325 'git cl upload -o uploadvalidator~skip\n\n'
2326 'If git-cl is not working correctly, file a bug under the '
2327 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002328 if 'git push -o nokeycheck' in str(e.stdout):
2329 raise GitPushError(
2330 'Failed to create a change, very likely due to a private key being '
2331 'detected. Please examine output above for the reason of the '
2332 'failure.\n'
2333 'If this is a false positive, you can try to bypass private key '
2334 'detection by using push option '
2335 '-o nokeycheck, e.g.:\n'
2336 'git cl upload -o nokeycheck\n\n'
2337 'If git-cl is not working correctly, file a bug under the '
2338 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002339
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002340 raise GitPushError(
2341 'Failed to create a change. Please examine output above for the '
2342 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002343 'For emergencies, Googlers can escalate to '
2344 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002345 'Hint: run command below to diagnose common Git/Gerrit '
2346 'credential problems:\n'
2347 ' git cl creds-check\n'
2348 '\n'
2349 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2350 'component including the files below.\n'
2351 'Review the files before upload, since they might contain sensitive '
2352 'information.\n'
2353 'Set the Restrict-View-Google label so that they are not publicly '
2354 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002355 finally:
2356 execution_time = time_time() - before_push
2357 metrics.collector.add_repeated('sub_commands', {
2358 'command': 'git push',
2359 'execution_time': execution_time,
2360 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002361 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002362 })
2363
Edward Lemur1b52d872019-05-09 21:12:12 +00002364 git_push_metadata['execution_time'] = execution_time
2365 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002366 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002367
Edward Lemur1b52d872019-05-09 21:12:12 +00002368 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002369 gclient_utils.rmtree(traces_dir)
2370
2371 return push_stdout
2372
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002373 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2374 change_desc):
2375 """Upload the current branch to Gerrit, retry if new remote HEAD is
2376 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002377 remote, remote_branch = self.GetRemoteBranch()
2378 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2379
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002380 try:
2381 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002382 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002383 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002384 # Repository might be in the middle of transition to main branch as
2385 # default, and uploads to old default might be blocked.
2386 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002387 DieWithError(str(e), change_desc)
2388
Josip Sokcevicb631a882021-01-06 18:18:10 +00002389 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2390 self.GetGerritProject())
2391 if project_head == branch:
2392 DieWithError(str(e), change_desc)
2393 branch = project_head
2394
2395 print("WARNING: Fetching remote state and retrying upload to default "
2396 "branch...")
2397 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002398 options.edit_description = False
2399 options.force = True
2400 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002401 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2402 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002403 except GitPushError as e:
2404 DieWithError(str(e), change_desc)
2405
2406 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002407 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002408 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002410 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002411 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002412 # User requested to change description
2413 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002414 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002416 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002417 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002418 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002419 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002420 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002421 if len(change_ids) == 1:
2422 change_id = change_ids[0]
2423 else:
2424 change_id = GenerateGerritChangeId(change_desc.description)
2425 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002427 if options.preserve_tryjobs:
2428 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002429
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002431 parent = self._ComputeParent(
2432 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002434 with gclient_utils.temporary_file() as desc_tempfile:
2435 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2436 ref_to_push = RunGit(
2437 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002438 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002439 if options.no_add_changeid:
2440 pass
2441 else: # adding Change-Ids is okay.
2442 if not git_footers.get_footer_change_id(change_desc.description):
2443 DownloadGerritHook(False)
2444 change_desc.set_description(
2445 self._AddChangeIdToCommitMessage(change_desc.description,
2446 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002447 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002448 # For no-squash mode, we assume the remote called "origin" is the one we
2449 # want. It is not worthwhile to support different workflows for
2450 # no-squash mode.
2451 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002452 # attempt to extract the changeid from the current description
2453 # fail informatively if not possible.
2454 change_id_candidates = git_footers.get_footer_change_id(
2455 change_desc.description)
2456 if not change_id_candidates:
2457 DieWithError("Unable to extract change-id from message.")
2458 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002459
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002460 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002461 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2462 ref_to_push)]).splitlines()
2463 if len(commits) > 1:
2464 print('WARNING: This will upload %d commits. Run the following command '
2465 'to see which commits will be uploaded: ' % len(commits))
2466 print('git log %s..%s' % (parent, ref_to_push))
2467 print('You can also use `git squash-branch` to squash these into a '
2468 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002469 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002470
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002471 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002472 cc = []
2473 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2474 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2475 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002476 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002477 if len(cc) > 100:
2478 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2479 'process/lsc/lsc_workflow.md')
2480 print('WARNING: This will auto-CC %s users.' % len(cc))
2481 print('LSC may be more appropriate: %s' % lsc)
2482 print('You can also use the --no-autocc flag to disable auto-CC.')
2483 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002484 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002485 if options.cc:
2486 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002487 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002488 if change_desc.get_cced():
2489 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002490 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002491 valid_accounts = set(reviewers + cc)
2492 # TODO(crbug/877717): relax this for all hosts.
2493 else:
2494 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002495 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002496 logging.info('accounts %s are recognized, %s invalid',
2497 sorted(valid_accounts),
2498 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002499
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002500 # Extra options that can be specified at push time. Doc:
2501 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002502 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002503
Aaron Gable844cf292017-06-28 11:32:59 -07002504 # By default, new changes are started in WIP mode, and subsequent patchsets
2505 # don't send email. At any time, passing --send-mail will mark the change
2506 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002507 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002508 refspec_opts.append('ready')
2509 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002510 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002511 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002512 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002513 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002514
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002515 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002516 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002517
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002518 # Set options.title in case user was prompted in _GetTitleForUpload and
2519 # _CMDUploadChange needs to be called again.
2520 options.title = self._GetTitleForUpload(options)
2521 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002522 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002523 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002524 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002525
agablec6787972016-09-09 16:13:34 -07002526 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002527 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002528
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002529 for r in sorted(reviewers):
2530 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002531 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002532 reviewers.remove(r)
2533 else:
2534 # TODO(tandrii): this should probably be a hard failure.
2535 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2536 % r)
2537 for c in sorted(cc):
2538 # refspec option will be rejected if cc doesn't correspond to an
2539 # account, even though REST call to add such arbitrary cc may succeed.
2540 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002541 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002542 cc.remove(c)
2543
rmistry9eadede2016-09-19 11:22:43 -07002544 if options.topic:
2545 # Documentation on Gerrit topics is here:
2546 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002547 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002548
Edward Lemur687ca902018-12-05 02:30:30 +00002549 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002550 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002551 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002552 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002553 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002554 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002555 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002556 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002557 elif options.cq_quick_run:
2558 refspec_opts.append('l=Commit-Queue+1')
2559 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002560
2561 if change_desc.get_reviewers(tbr_only=True):
2562 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002563 self.GetGerritHost(),
2564 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002565 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002566
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002567 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002568 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002569 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002570 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002571 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2572
2573 refspec_suffix = ''
2574 if refspec_opts:
2575 refspec_suffix = '%' + ','.join(refspec_opts)
2576 assert ' ' not in refspec_suffix, (
2577 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2578 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002579
Edward Lemur1b52d872019-05-09 21:12:12 +00002580 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002581 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002582 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002583 'change_id': change_id,
2584 'description': change_desc.description,
2585 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002586
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002587 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002588 git_push_metadata,
2589 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002590
2591 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002592 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002593 change_numbers = [m.group(1)
2594 for m in map(regex.match, push_stdout.splitlines())
2595 if m]
2596 if len(change_numbers) != 1:
2597 DieWithError(
2598 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002599 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002600 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002601 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002602
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002603 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002604 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002605 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002606 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002607 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002608 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002609 reviewers, cc,
2610 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002611
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002612 return 0
2613
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002614 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2615 change_desc):
2616 """Computes parent of the generated commit to be uploaded to Gerrit.
2617
2618 Returns revision or a ref name.
2619 """
2620 if custom_cl_base:
2621 # Try to avoid creating additional unintended CLs when uploading, unless
2622 # user wants to take this risk.
2623 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2624 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2625 local_ref_of_target_remote])
2626 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002627 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002628 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2629 'If you proceed with upload, more than 1 CL may be created by '
2630 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2631 'If you are certain that specified base `%s` has already been '
2632 'uploaded to Gerrit as another CL, you may proceed.\n' %
2633 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2634 if not force:
2635 confirm_or_exit(
2636 'Do you take responsibility for cleaning up potential mess '
2637 'resulting from proceeding with upload?',
2638 action='upload')
2639 return custom_cl_base
2640
Aaron Gablef97e33d2017-03-30 15:44:27 -07002641 if remote != '.':
2642 return self.GetCommonAncestorWithUpstream()
2643
2644 # If our upstream branch is local, we base our squashed commit on its
2645 # squashed version.
2646 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2647
Aaron Gablef97e33d2017-03-30 15:44:27 -07002648 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002649 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002650 if upstream_branch_name == 'main':
2651 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002652
2653 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002654 # TODO(tandrii): consider checking parent change in Gerrit and using its
2655 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2656 # the tree hash of the parent branch. The upside is less likely bogus
2657 # requests to reupload parent change just because it's uploadhash is
2658 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002659 parent = scm.GIT.GetBranchConfig(
2660 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002661 # Verify that the upstream branch has been uploaded too, otherwise
2662 # Gerrit will create additional CLs when uploading.
2663 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2664 RunGitSilent(['rev-parse', parent + ':'])):
2665 DieWithError(
2666 '\nUpload upstream branch %s first.\n'
2667 'It is likely that this branch has been rebased since its last '
2668 'upload, so you just need to upload it again.\n'
2669 '(If you uploaded it with --no-squash, then branch dependencies '
2670 'are not supported, and you should reupload with --squash.)'
2671 % upstream_branch_name,
2672 change_desc)
2673 return parent
2674
Edward Lemura12175c2020-03-09 16:58:26 +00002675 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002676 """Re-commits using the current message, assumes the commit hook is in
2677 place.
2678 """
Edward Lemura12175c2020-03-09 16:58:26 +00002679 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002680 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002681 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002682 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002683 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002684
2685 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002686
tandriie113dfd2016-10-11 10:20:12 -07002687 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002688 try:
2689 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002690 except GerritChangeNotExists:
2691 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002692
2693 if data['status'] in ('ABANDONED', 'MERGED'):
2694 return 'CL %s is closed' % self.GetIssue()
2695
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002696 def GetGerritChange(self, patchset=None):
2697 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002698 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002699 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002700 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002701 data = self._GetChangeDetail(['ALL_REVISIONS'])
2702
2703 assert host and issue and patchset, 'CL must be uploaded first'
2704
2705 has_patchset = any(
2706 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002707 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002708 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002709 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002710 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002711
tandrii8c5a3532016-11-04 07:52:02 -07002712 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002713 'host': host,
2714 'change': issue,
2715 'project': data['project'],
2716 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002717 }
tandriie113dfd2016-10-11 10:20:12 -07002718
tandriide281ae2016-10-12 06:02:30 -07002719 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002720 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002721
Edward Lemur707d70b2018-02-07 00:50:14 +01002722 def GetReviewers(self):
2723 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002724 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002725
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002726
Lei Zhang8a0efc12020-08-05 19:58:45 +00002727def _get_bug_line_values(default_project_prefix, bugs):
2728 """Given default_project_prefix and comma separated list of bugs, yields bug
2729 line values.
tandriif9aefb72016-07-01 09:06:51 -07002730
2731 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002732 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002733 * string, which is left as is.
2734
2735 This function may produce more than one line, because bugdroid expects one
2736 project per line.
2737
Lei Zhang8a0efc12020-08-05 19:58:45 +00002738 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002739 ['v8:123', 'chromium:789']
2740 """
2741 default_bugs = []
2742 others = []
2743 for bug in bugs.split(','):
2744 bug = bug.strip()
2745 if bug:
2746 try:
2747 default_bugs.append(int(bug))
2748 except ValueError:
2749 others.append(bug)
2750
2751 if default_bugs:
2752 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002753 if default_project_prefix:
2754 if not default_project_prefix.endswith(':'):
2755 default_project_prefix += ':'
2756 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002757 else:
2758 yield default_bugs
2759 for other in sorted(others):
2760 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2761 yield other
2762
2763
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002764class ChangeDescription(object):
2765 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002766 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002767 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002768 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002769 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002770 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002771 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2772 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002773 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002774 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002775
Dan Beamd8b04ca2019-10-10 21:23:26 +00002776 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002777 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002778 if bug:
2779 regexp = re.compile(self.BUG_LINE)
2780 prefix = settings.GetBugPrefix()
2781 if not any((regexp.match(line) for line in self._description_lines)):
2782 values = list(_get_bug_line_values(prefix, bug))
2783 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002784 if fixed:
2785 regexp = re.compile(self.FIXED_LINE)
2786 prefix = settings.GetBugPrefix()
2787 if not any((regexp.match(line) for line in self._description_lines)):
2788 values = list(_get_bug_line_values(prefix, fixed))
2789 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002790
agable@chromium.org42c20792013-09-12 17:34:49 +00002791 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002792 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002793 return '\n'.join(self._description_lines)
2794
2795 def set_description(self, desc):
2796 if isinstance(desc, basestring):
2797 lines = desc.splitlines()
2798 else:
2799 lines = [line.rstrip() for line in desc]
2800 while lines and not lines[0]:
2801 lines.pop(0)
2802 while lines and not lines[-1]:
2803 lines.pop(-1)
2804 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002805
Edward Lemur5a644f82020-03-18 16:44:57 +00002806 def ensure_change_id(self, change_id):
2807 description = self.description
2808 footer_change_ids = git_footers.get_footer_change_id(description)
2809 # Make sure that the Change-Id in the description matches the given one.
2810 if footer_change_ids != [change_id]:
2811 if footer_change_ids:
2812 # Remove any existing Change-Id footers since they don't match the
2813 # expected change_id footer.
2814 description = git_footers.remove_footer(description, 'Change-Id')
2815 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2816 'if you want to set a new one.')
2817 # Add the expected Change-Id footer.
2818 description = git_footers.add_footer_change_id(description, change_id)
2819 self.set_description(description)
2820
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002821 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002822 """Rewrites the R=/TBR= line(s) as a single line each.
2823
2824 Args:
2825 reviewers (list(str)) - list of additional emails to use for reviewers.
2826 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002827 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002828 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002829 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002830
2831 reviewers = set(reviewers)
2832 tbrs = set(tbrs)
2833 LOOKUP = {
2834 'TBR': tbrs,
2835 'R': reviewers,
2836 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002837
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002838 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002839 regexp = re.compile(self.R_LINE)
2840 matches = [regexp.match(line) for line in self._description_lines]
2841 new_desc = [l for i, l in enumerate(self._description_lines)
2842 if not matches[i]]
2843 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002844
agable@chromium.org42c20792013-09-12 17:34:49 +00002845 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002846
2847 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002848 for match in matches:
2849 if not match:
2850 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002851 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2852
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002853 # If any folks ended up in both groups, remove them from tbrs.
2854 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002855
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002856 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2857 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002858
2859 # Put the new lines in the description where the old first R= line was.
2860 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2861 if 0 <= line_loc < len(self._description_lines):
2862 if new_tbr_line:
2863 self._description_lines.insert(line_loc, new_tbr_line)
2864 if new_r_line:
2865 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002866 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002867 if new_r_line:
2868 self.append_footer(new_r_line)
2869 if new_tbr_line:
2870 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002871
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002872 def set_preserve_tryjobs(self):
2873 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2874 footers = git_footers.parse_footers(self.description)
2875 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2876 if v.lower() == 'true':
2877 return
2878 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2879
Anthony Polito8b955342019-09-24 19:01:36 +00002880 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002881 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002882 self.set_description([
2883 '# Enter a description of the change.',
2884 '# This will be displayed on the codereview site.',
2885 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002886 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002887 '--------------------',
2888 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002889 bug_regexp = re.compile(self.BUG_LINE)
2890 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002891 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002892 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002893
Dan Beamd8b04ca2019-10-10 21:23:26 +00002894 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002895 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002896
Bruce Dawsonfc487042020-10-27 19:11:37 +00002897 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002898 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002899 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002900 if not content:
2901 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002903
Bruce Dawson2377b012018-01-11 16:46:49 -08002904 # Strip off comments and default inserted "Bug:" line.
2905 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002906 (line.startswith('#') or
2907 line.rstrip() == "Bug:" or
2908 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002909 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002910 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002911 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002912
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002913 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002914 """Adds a footer line to the description.
2915
2916 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2917 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2918 that Gerrit footers are always at the end.
2919 """
2920 parsed_footer_line = git_footers.parse_footer(line)
2921 if parsed_footer_line:
2922 # Line is a gerrit footer in the form: Footer-Key: any value.
2923 # Thus, must be appended observing Gerrit footer rules.
2924 self.set_description(
2925 git_footers.add_footer(self.description,
2926 key=parsed_footer_line[0],
2927 value=parsed_footer_line[1]))
2928 return
2929
2930 if not self._description_lines:
2931 self._description_lines.append(line)
2932 return
2933
2934 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2935 if gerrit_footers:
2936 # git_footers.split_footers ensures that there is an empty line before
2937 # actual (gerrit) footers, if any. We have to keep it that way.
2938 assert top_lines and top_lines[-1] == ''
2939 top_lines, separator = top_lines[:-1], top_lines[-1:]
2940 else:
2941 separator = [] # No need for separator if there are no gerrit_footers.
2942
2943 prev_line = top_lines[-1] if top_lines else ''
2944 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2945 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2946 top_lines.append('')
2947 top_lines.append(line)
2948 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002949
tandrii99a72f22016-08-17 14:33:24 -07002950 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002951 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002952 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002953 reviewers = [match.group(2).strip()
2954 for match in matches
2955 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002956 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002957
bradnelsond975b302016-10-23 12:20:23 -07002958 def get_cced(self):
2959 """Retrieves the list of reviewers."""
2960 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2961 cced = [match.group(2).strip() for match in matches if match]
2962 return cleanup_list(cced)
2963
Nodir Turakulov23b82142017-11-16 11:04:25 -08002964 def get_hash_tags(self):
2965 """Extracts and sanitizes a list of Gerrit hashtags."""
2966 subject = (self._description_lines or ('',))[0]
2967 subject = re.sub(
2968 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2969
2970 tags = []
2971 start = 0
2972 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2973 while True:
2974 m = bracket_exp.match(subject, start)
2975 if not m:
2976 break
2977 tags.append(self.sanitize_hash_tag(m.group(1)))
2978 start = m.end()
2979
2980 if not tags:
2981 # Try "Tag: " prefix.
2982 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2983 if m:
2984 tags.append(self.sanitize_hash_tag(m.group(1)))
2985 return tags
2986
2987 @classmethod
2988 def sanitize_hash_tag(cls, tag):
2989 """Returns a sanitized Gerrit hash tag.
2990
2991 A sanitized hashtag can be used as a git push refspec parameter value.
2992 """
2993 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2994
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002995
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002996def FindCodereviewSettingsFile(filename='codereview.settings'):
2997 """Finds the given file starting in the cwd and going up.
2998
2999 Only looks up to the top of the repository unless an
3000 'inherit-review-settings-ok' file exists in the root of the repository.
3001 """
3002 inherit_ok_file = 'inherit-review-settings-ok'
3003 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003004 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003005 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3006 root = '/'
3007 while True:
3008 if filename in os.listdir(cwd):
3009 if os.path.isfile(os.path.join(cwd, filename)):
3010 return open(os.path.join(cwd, filename))
3011 if cwd == root:
3012 break
3013 cwd = os.path.dirname(cwd)
3014
3015
3016def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003017 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003018 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003019
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003020 def SetProperty(name, setting, unset_error_ok=False):
3021 fullname = 'rietveld.' + name
3022 if setting in keyvals:
3023 RunGit(['config', fullname, keyvals[setting]])
3024 else:
3025 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3026
tandrii48df5812016-10-17 03:55:37 -07003027 if not keyvals.get('GERRIT_HOST', False):
3028 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003029 # Only server setting is required. Other settings can be absent.
3030 # In that case, we ignore errors raised during option deletion attempt.
3031 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3032 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3033 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003034 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003035 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3036 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003037 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3038 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003039 SetProperty(
3040 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003041 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003042
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003043 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003044 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003045
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003046 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003047 RunGit(['config', 'gerrit.squash-uploads',
3048 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003049
tandrii@chromium.org28253532016-04-14 13:46:56 +00003050 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003051 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003052 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3053
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003054 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003055 # should be of the form
3056 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3057 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003058 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3059 keyvals['ORIGIN_URL_CONFIG']])
3060
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003061
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003062def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003063 """Downloads a network object to a local file, like urllib.urlretrieve.
3064
3065 This is necessary because urllib is broken for SSL connections via a proxy.
3066 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003067 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003068 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003069
3070
ukai@chromium.org712d6102013-11-27 00:52:58 +00003071def hasSheBang(fname):
3072 """Checks fname is a #! script."""
3073 with open(fname) as f:
3074 return f.read(2).startswith('#!')
3075
3076
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003077def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003078 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003079
3080 Args:
3081 force: True to update hooks. False to install hooks if not present.
3082 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003083 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003084 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3085 if not os.access(dst, os.X_OK):
3086 if os.path.exists(dst):
3087 if not force:
3088 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003089 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003090 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003091 if not hasSheBang(dst):
3092 DieWithError('Not a script: %s\n'
3093 'You need to download from\n%s\n'
3094 'into .git/hooks/commit-msg and '
3095 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003096 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3097 except Exception:
3098 if os.path.exists(dst):
3099 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003100 DieWithError('\nFailed to download hooks.\n'
3101 'You need to download from\n%s\n'
3102 'into .git/hooks/commit-msg and '
3103 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003104
3105
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003106class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003107 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003108
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003109 _GOOGLESOURCE = 'googlesource.com'
3110
3111 def __init__(self):
3112 # Cached list of [host, identity, source], where source is either
3113 # .gitcookies or .netrc.
3114 self._all_hosts = None
3115
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003116 def ensure_configured_gitcookies(self):
3117 """Runs checks and suggests fixes to make git use .gitcookies from default
3118 path."""
3119 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3120 configured_path = RunGitSilent(
3121 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003122 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003123 if configured_path:
3124 self._ensure_default_gitcookies_path(configured_path, default)
3125 else:
3126 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003127
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003128 @staticmethod
3129 def _ensure_default_gitcookies_path(configured_path, default_path):
3130 assert configured_path
3131 if configured_path == default_path:
3132 print('git is already configured to use your .gitcookies from %s' %
3133 configured_path)
3134 return
3135
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003136 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003137 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3138 (configured_path, default_path))
3139
3140 if not os.path.exists(configured_path):
3141 print('However, your configured .gitcookies file is missing.')
3142 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3143 action='reconfigure')
3144 RunGit(['config', '--global', 'http.cookiefile', default_path])
3145 return
3146
3147 if os.path.exists(default_path):
3148 print('WARNING: default .gitcookies file already exists %s' %
3149 default_path)
3150 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3151 default_path)
3152
3153 confirm_or_exit('Move existing .gitcookies to default location?',
3154 action='move')
3155 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003156 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003157 print('Moved and reconfigured git to use .gitcookies from %s' %
3158 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003159
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003160 @staticmethod
3161 def _configure_gitcookies_path(default_path):
3162 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3163 if os.path.exists(netrc_path):
3164 print('You seem to be using outdated .netrc for git credentials: %s' %
3165 netrc_path)
3166 print('This tool will guide you through setting up recommended '
3167 '.gitcookies store for git credentials.\n'
3168 '\n'
3169 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3170 ' git config --global --unset http.cookiefile\n'
3171 ' mv %s %s.backup\n\n' % (default_path, default_path))
3172 confirm_or_exit(action='setup .gitcookies')
3173 RunGit(['config', '--global', 'http.cookiefile', default_path])
3174 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003175
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003176 def get_hosts_with_creds(self, include_netrc=False):
3177 if self._all_hosts is None:
3178 a = gerrit_util.CookiesAuthenticator()
3179 self._all_hosts = [
3180 (h, u, s)
3181 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003182 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3183 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003184 )
3185 if h.endswith(self._GOOGLESOURCE)
3186 ]
3187
3188 if include_netrc:
3189 return self._all_hosts
3190 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3191
3192 def print_current_creds(self, include_netrc=False):
3193 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3194 if not hosts:
3195 print('No Git/Gerrit credentials found')
3196 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003197 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003198 header = [('Host', 'User', 'Which file'),
3199 ['=' * l for l in lengths]]
3200 for row in (header + hosts):
3201 print('\t'.join((('%%+%ds' % l) % s)
3202 for l, s in zip(lengths, row)))
3203
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003204 @staticmethod
3205 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003206 """Parses identity "git-<username>.domain" into <username> and domain."""
3207 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003208 # distinguishable from sub-domains. But we do know typical domains:
3209 if identity.endswith('.chromium.org'):
3210 domain = 'chromium.org'
3211 username = identity[:-len('.chromium.org')]
3212 else:
3213 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003214 if username.startswith('git-'):
3215 username = username[len('git-'):]
3216 return username, domain
3217
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003218 def _canonical_git_googlesource_host(self, host):
3219 """Normalizes Gerrit hosts (with '-review') to Git host."""
3220 assert host.endswith(self._GOOGLESOURCE)
3221 # Prefix doesn't include '.' at the end.
3222 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3223 if prefix.endswith('-review'):
3224 prefix = prefix[:-len('-review')]
3225 return prefix + '.' + self._GOOGLESOURCE
3226
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003227 def _canonical_gerrit_googlesource_host(self, host):
3228 git_host = self._canonical_git_googlesource_host(host)
3229 prefix = git_host.split('.', 1)[0]
3230 return prefix + '-review.' + self._GOOGLESOURCE
3231
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003232 def _get_counterpart_host(self, host):
3233 assert host.endswith(self._GOOGLESOURCE)
3234 git = self._canonical_git_googlesource_host(host)
3235 gerrit = self._canonical_gerrit_googlesource_host(git)
3236 return git if gerrit == host else gerrit
3237
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003238 def has_generic_host(self):
3239 """Returns whether generic .googlesource.com has been configured.
3240
3241 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3242 """
3243 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3244 if host == '.' + self._GOOGLESOURCE:
3245 return True
3246 return False
3247
3248 def _get_git_gerrit_identity_pairs(self):
3249 """Returns map from canonic host to pair of identities (Git, Gerrit).
3250
3251 One of identities might be None, meaning not configured.
3252 """
3253 host_to_identity_pairs = {}
3254 for host, identity, _ in self.get_hosts_with_creds():
3255 canonical = self._canonical_git_googlesource_host(host)
3256 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3257 idx = 0 if canonical == host else 1
3258 pair[idx] = identity
3259 return host_to_identity_pairs
3260
3261 def get_partially_configured_hosts(self):
3262 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003263 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003264 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003265 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003266
3267 def get_conflicting_hosts(self):
3268 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003269 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003270 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003271 if None not in (i1, i2) and i1 != i2)
3272
3273 def get_duplicated_hosts(self):
3274 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003275 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003276
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003277
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003278 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003279 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003280 hosts = sorted(hosts)
3281 assert hosts
3282 if extra_column_func is None:
3283 extras = [''] * len(hosts)
3284 else:
3285 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3287 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003288 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003289 lines.append(tmpl % he)
3290 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003292 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003293 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003294 yield ('.googlesource.com wildcard record detected',
3295 ['Chrome Infrastructure team recommends to list full host names '
3296 'explicitly.'],
3297 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003298
3299 dups = self.get_duplicated_hosts()
3300 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003301 yield ('The following hosts were defined twice',
3302 self._format_hosts(dups),
3303 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003304
3305 partial = self.get_partially_configured_hosts()
3306 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003307 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3308 'These hosts are missing',
3309 self._format_hosts(partial, lambda host: 'but %s defined' %
3310 self._get_counterpart_host(host)),
3311 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003312
3313 conflicting = self.get_conflicting_hosts()
3314 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003315 yield ('The following Git hosts have differing credentials from their '
3316 'Gerrit counterparts',
3317 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3318 tuple(self._get_git_gerrit_identity_pairs()[host])),
3319 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003320
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003321 def find_and_report_problems(self):
3322 """Returns True if there was at least one problem, else False."""
3323 found = False
3324 bad_hosts = set()
3325 for title, sublines, hosts in self._find_problems():
3326 if not found:
3327 found = True
3328 print('\n\n.gitcookies problem report:\n')
3329 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003330 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003331 if sublines:
3332 print()
3333 print(' %s' % '\n '.join(sublines))
3334 print()
3335
3336 if bad_hosts:
3337 assert found
3338 print(' You can manually remove corresponding lines in your %s file and '
3339 'visit the following URLs with correct account to generate '
3340 'correct credential lines:\n' %
3341 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3342 print(' %s' % '\n '.join(sorted(set(
3343 gerrit_util.CookiesAuthenticator().get_new_password_url(
3344 self._canonical_git_googlesource_host(host))
3345 for host in bad_hosts
3346 ))))
3347 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003348
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003349
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003350@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003351def CMDcreds_check(parser, args):
3352 """Checks credentials and suggests changes."""
3353 _, _ = parser.parse_args(args)
3354
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003355 # Code below checks .gitcookies. Abort if using something else.
3356 authn = gerrit_util.Authenticator.get()
3357 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003358 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003359 'This command is not designed for bot environment. It checks '
3360 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003361 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3362 if isinstance(authn, gerrit_util.GceAuthenticator):
3363 message += (
3364 '\n'
3365 'If you need to run this on GCE or a cloudtop instance, '
3366 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3367 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003368
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003369 checker = _GitCookiesChecker()
3370 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003371
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003372 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003373 checker.print_current_creds(include_netrc=True)
3374
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003375 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003376 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003377 return 0
3378 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003379
3380
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003381@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003382def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003383 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003384 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003385 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003386 _, args = parser.parse_args(args)
3387 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003388 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003389 return RunGit(['config', 'branch.%s.base-url' % branch],
3390 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003391
3392 print('Setting base-url to %s' % args[0])
3393 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3394 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003395
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003396
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003397def color_for_status(status):
3398 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003399 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003400 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003401 'unsent': BOLD + Fore.YELLOW,
3402 'waiting': BOLD + Fore.RED,
3403 'reply': BOLD + Fore.YELLOW,
3404 'not lgtm': BOLD + Fore.RED,
3405 'lgtm': BOLD + Fore.GREEN,
3406 'commit': BOLD + Fore.MAGENTA,
3407 'closed': BOLD + Fore.CYAN,
3408 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003409 }.get(status, Fore.WHITE)
3410
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003411
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003412def get_cl_statuses(changes, fine_grained, max_processes=None):
3413 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003414
3415 If fine_grained is true, this will fetch CL statuses from the server.
3416 Otherwise, simply indicate if there's a matching url for the given branches.
3417
3418 If max_processes is specified, it is used as the maximum number of processes
3419 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3420 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003421
3422 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003423 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003424 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003425 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003426
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003427 if not fine_grained:
3428 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003429 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003430 for cl in changes:
3431 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003432 return
3433
3434 # First, sort out authentication issues.
3435 logging.debug('ensuring credentials exist')
3436 for cl in changes:
3437 cl.EnsureAuthenticated(force=False, refresh=True)
3438
3439 def fetch(cl):
3440 try:
3441 return (cl, cl.GetStatus())
3442 except:
3443 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003444 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003445 raise
3446
3447 threads_count = len(changes)
3448 if max_processes:
3449 threads_count = max(1, min(threads_count, max_processes))
3450 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3451
Edward Lemur61bf4172020-02-24 23:22:37 +00003452 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003453 fetched_cls = set()
3454 try:
3455 it = pool.imap_unordered(fetch, changes).__iter__()
3456 while True:
3457 try:
3458 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003459 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003460 break
3461 fetched_cls.add(cl)
3462 yield cl, status
3463 finally:
3464 pool.close()
3465
3466 # Add any branches that failed to fetch.
3467 for cl in set(changes) - fetched_cls:
3468 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003469
rmistry@google.com2dd99862015-06-22 12:22:18 +00003470
Jose Lopes3863fc52020-04-07 17:00:25 +00003471def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003472 """Uploads CLs of local branches that are dependents of the current branch.
3473
3474 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003475
3476 test1 -> test2.1 -> test3.1
3477 -> test3.2
3478 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003479
3480 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3481 run on the dependent branches in this order:
3482 test2.1, test3.1, test3.2, test2.2, test3.3
3483
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003484 Note: This function does not rebase your local dependent branches. Use it
3485 when you make a change to the parent branch that will not conflict
3486 with its dependent branches, and you would like their dependencies
3487 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003488 """
3489 if git_common.is_dirty_git_tree('upload-branch-deps'):
3490 return 1
3491
3492 root_branch = cl.GetBranch()
3493 if root_branch is None:
3494 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3495 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003496 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003497 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3498 'patchset dependencies without an uploaded CL.')
3499
3500 branches = RunGit(['for-each-ref',
3501 '--format=%(refname:short) %(upstream:short)',
3502 'refs/heads'])
3503 if not branches:
3504 print('No local branches found.')
3505 return 0
3506
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003507 # Create a dictionary of all local branches to the branches that are
3508 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003509 tracked_to_dependents = collections.defaultdict(list)
3510 for b in branches.splitlines():
3511 tokens = b.split()
3512 if len(tokens) == 2:
3513 branch_name, tracked = tokens
3514 tracked_to_dependents[tracked].append(branch_name)
3515
vapiera7fbd5a2016-06-16 09:17:49 -07003516 print()
3517 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003518 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003519
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 def traverse_dependents_preorder(branch, padding=''):
3521 dependents_to_process = tracked_to_dependents.get(branch, [])
3522 padding += ' '
3523 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525 dependents.append(dependent)
3526 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003527
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003529 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003530
3531 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533 return 0
3534
Jose Lopes3863fc52020-04-07 17:00:25 +00003535 if not force:
3536 confirm_or_exit('This command will checkout all dependent branches and run '
3537 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003538
rmistry@google.com2dd99862015-06-22 12:22:18 +00003539 # Record all dependents that failed to upload.
3540 failures = {}
3541 # Go through all dependents, checkout the branch and upload.
3542 try:
3543 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003544 print()
3545 print('--------------------------------------')
3546 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003547 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003548 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549 try:
3550 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003551 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003552 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003553 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003554 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003555 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003556 finally:
3557 # Swap back to the original root branch.
3558 RunGit(['checkout', '-q', root_branch])
3559
vapiera7fbd5a2016-06-16 09:17:49 -07003560 print()
3561 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562 for dependent_branch in dependents:
3563 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003564 print(' %s : %s' % (dependent_branch, upload_status))
3565 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003566
3567 return 0
3568
3569
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003570def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003571 """Given a proposed tag name, returns a tag name that is guaranteed to be
3572 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3573 or 'foo-3', and so on."""
3574
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003575 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003576 for suffix_num in itertools.count(1):
3577 if suffix_num == 1:
3578 to_check = proposed_tag
3579 else:
3580 to_check = '%s-%d' % (proposed_tag, suffix_num)
3581
3582 if to_check not in existing_tags:
3583 return to_check
3584
3585
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003586@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003587def CMDarchive(parser, args):
3588 """Archives and deletes branches associated with closed changelists."""
3589 parser.add_option(
3590 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003591 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003592 parser.add_option(
3593 '-f', '--force', action='store_true',
3594 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003595 parser.add_option(
3596 '-d', '--dry-run', action='store_true',
3597 help='Skip the branch tagging and removal steps.')
3598 parser.add_option(
3599 '-t', '--notags', action='store_true',
3600 help='Do not tag archived branches. '
3601 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003602 parser.add_option(
3603 '-p',
3604 '--pattern',
3605 default='git-cl-archived-{issue}-{branch}',
3606 help='Format string for archive tags. '
3607 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003608
kmarshall3bff56b2016-06-06 18:31:47 -07003609 options, args = parser.parse_args(args)
3610 if args:
3611 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003612
3613 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3614 if not branches:
3615 return 0
3616
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003617 tags = RunGit(['for-each-ref', '--format=%(refname)',
3618 'refs/tags']).splitlines() or []
3619 tags = [t.split('/')[-1] for t in tags]
3620
vapiera7fbd5a2016-06-16 09:17:49 -07003621 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003622 changes = [Changelist(branchref=b)
3623 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003624 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3625 statuses = get_cl_statuses(changes,
3626 fine_grained=True,
3627 max_processes=options.maxjobs)
3628 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003629 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3630 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003631 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003632 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003633 proposal.sort()
3634
3635 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003636 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003637 return 0
3638
Edward Lemur85153282020-02-14 22:06:29 +00003639 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003640
vapiera7fbd5a2016-06-16 09:17:49 -07003641 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003642 if options.notags:
3643 for next_item in proposal:
3644 print(' ' + next_item[0])
3645 else:
3646 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3647 for next_item in proposal:
3648 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003649
kmarshall9249e012016-08-23 12:02:16 -07003650 # Quit now on precondition failure or if instructed by the user, either
3651 # via an interactive prompt or by command line flags.
3652 if options.dry_run:
3653 print('\nNo changes were made (dry run).\n')
3654 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003655
3656 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003657 print('You are currently on a branch \'%s\' which is associated with a '
3658 'closed codereview issue, so archive cannot proceed. Please '
3659 'checkout another branch and run this command again.' %
3660 current_branch)
3661 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003662
3663 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003664 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003665 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003666 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003667 return 1
3668
3669 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003670 if not options.notags:
3671 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003672
3673 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3674 # Clean up the tag if we failed to delete the branch.
3675 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003676
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003678
3679 return 0
3680
3681
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003682@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003683def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003684 """Show status of changelists.
3685
3686 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003687 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003688 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003689 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003690 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003691 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003692 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003693 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003694
3695 Also see 'git cl comments'.
3696 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003697 parser.add_option(
3698 '--no-branch-color',
3699 action='store_true',
3700 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003701 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003702 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003703 parser.add_option('-f', '--fast', action='store_true',
3704 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003705 parser.add_option(
3706 '-j', '--maxjobs', action='store', type=int,
3707 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003708 parser.add_option(
3709 '-i', '--issue', type=int,
3710 help='Operate on this issue instead of the current branch\'s implicit '
3711 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003712 parser.add_option('-d',
3713 '--date-order',
3714 action='store_true',
3715 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003716 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003717 if args:
3718 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003719
iannuccie53c9352016-08-17 14:40:40 -07003720 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003721 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003722
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003723 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003724 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003725 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003726 if cl.GetIssue():
3727 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003728 elif options.field == 'id':
3729 issueid = cl.GetIssue()
3730 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003731 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003732 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003733 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003734 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003736 elif options.field == 'status':
3737 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003738 elif options.field == 'url':
3739 url = cl.GetIssueURL()
3740 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003741 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003742 return 0
3743
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003744 branches = RunGit([
3745 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3746 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003747 if not branches:
3748 print('No local branch found.')
3749 return 0
3750
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003751 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003752 Changelist(branchref=b, commit_date=ct)
3753 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3754 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003755 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003756 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003757 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003758 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003759
Edward Lemur85153282020-02-14 22:06:29 +00003760 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003761
3762 def FormatBranchName(branch, colorize=False):
3763 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3764 an asterisk when it is the current branch."""
3765
3766 asterisk = ""
3767 color = Fore.RESET
3768 if branch == current_branch:
3769 asterisk = "* "
3770 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003771 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003772
3773 if colorize:
3774 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003775 return asterisk + branch_name
3776
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003777 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003778
3779 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003780
3781 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003782 sorted_changes = sorted(changes,
3783 key=lambda c: c.GetCommitDate(),
3784 reverse=True)
3785 else:
3786 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3787 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003788 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003789 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003790 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003791 branch_statuses[c.GetBranch()] = status
3792 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003793 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003794 if url and (not status or status == 'error'):
3795 # The issue probably doesn't exist anymore.
3796 url += ' (broken)'
3797
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003798 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003799 # Turn off bold as well as colors.
3800 END = '\033[0m'
3801 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003802 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003803 color = ''
3804 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003805 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003806
Alan Cuttera3be9a52019-03-04 18:50:33 +00003807 branch_display = FormatBranchName(branch)
3808 padding = ' ' * (alignment - len(branch_display))
3809 if not options.no_branch_color:
3810 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003811
Alan Cuttera3be9a52019-03-04 18:50:33 +00003812 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3813 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003814
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003816 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003817 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003818 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003819 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003820 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003822 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003823 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003824 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003825 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003826 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 return 0
3828
3829
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003830def colorize_CMDstatus_doc():
3831 """To be called once in main() to add colors to git cl status help."""
3832 colors = [i for i in dir(Fore) if i[0].isupper()]
3833
3834 def colorize_line(line):
3835 for color in colors:
3836 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003837 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003838 indent = len(line) - len(line.lstrip(' ')) + 1
3839 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3840 return line
3841
3842 lines = CMDstatus.__doc__.splitlines()
3843 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3844
3845
phajdan.jre328cf92016-08-22 04:12:17 -07003846def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003847 if path == '-':
3848 json.dump(contents, sys.stdout)
3849 else:
3850 with open(path, 'w') as f:
3851 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003852
3853
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003854@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003855@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003857 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003858
3859 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003860 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003861 parser.add_option('-r', '--reverse', action='store_true',
3862 help='Lookup the branch(es) for the specified issues. If '
3863 'no issues are specified, all branches with mapped '
3864 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003865 parser.add_option('--json',
3866 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003867 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003868
dnj@chromium.org406c4402015-03-03 17:22:28 +00003869 if options.reverse:
3870 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003871 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003872 # Reverse issue lookup.
3873 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003874
3875 git_config = {}
3876 for config in RunGit(['config', '--get-regexp',
3877 r'branch\..*issue']).splitlines():
3878 name, _space, val = config.partition(' ')
3879 git_config[name] = val
3880
dnj@chromium.org406c4402015-03-03 17:22:28 +00003881 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003882 issue = git_config.get(
3883 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003884 if issue:
3885 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003886 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003887 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003888 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003889 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003890 try:
3891 issue_num = int(issue)
3892 except ValueError:
3893 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003894 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003895 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003897 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003898 if options.json:
3899 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003900 return 0
3901
3902 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003903 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003904 if not issue.valid:
3905 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3906 'or no argument to list it.\n'
3907 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003908 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003909 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003910 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003911 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003912 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3913 if options.json:
3914 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003915 'gerrit_host': cl.GetGerritHost(),
3916 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003917 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003918 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003919 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003920 return 0
3921
3922
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003923@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003924def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003925 """Shows or posts review comments for any changelist."""
3926 parser.add_option('-a', '--add-comment', dest='comment',
3927 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003928 parser.add_option('-p', '--publish', action='store_true',
3929 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003930 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003931 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003932 parser.add_option('-m', '--machine-readable', dest='readable',
3933 action='store_false', default=True,
3934 help='output comments in a format compatible with '
3935 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003936 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003937 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003938 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003939
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003940 issue = None
3941 if options.issue:
3942 try:
3943 issue = int(options.issue)
3944 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003945 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003946
Edward Lemur934836a2019-09-09 20:16:54 +00003947 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003948
3949 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003950 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 return 0
3952
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003953 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3954 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003955 for comment in summary:
3956 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003957 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003958 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003959 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003960 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003961 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003962 elif comment.autogenerated:
3963 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003964 else:
3965 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003966 print('\n%s%s %s%s\n%s' % (
3967 color,
3968 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3969 comment.sender,
3970 Fore.RESET,
3971 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3972
smut@google.comc85ac942015-09-15 16:34:43 +00003973 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003974 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003975 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003976 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3977 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003978 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003979 return 0
3980
3981
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003982@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003983@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003984def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003985 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003986 parser.add_option('-d', '--display', action='store_true',
3987 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003988 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003989 help='New description to set for this issue (- for stdin, '
3990 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003991 parser.add_option('-f', '--force', action='store_true',
3992 help='Delete any unpublished Gerrit edits for this issue '
3993 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003994
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003995 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003996
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003997 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003998 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003999 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004000 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004001 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004002
Edward Lemur934836a2019-09-09 20:16:54 +00004003 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004004 if target_issue_arg:
4005 kwargs['issue'] = target_issue_arg.issue
4006 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004007
4008 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004009 if not cl.GetIssue():
4010 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004011
Edward Lemur678a6842019-10-03 22:25:05 +00004012 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004013 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004014
Edward Lemur6c6827c2020-02-06 21:15:18 +00004015 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004016
smut@google.com34fb6b12015-07-13 20:03:26 +00004017 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004018 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004019 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004020
4021 if options.new_description:
4022 text = options.new_description
4023 if text == '-':
4024 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004025 elif text == '+':
4026 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004027 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004028
4029 description.set_description(text)
4030 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004031 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004032 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004033 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004034 return 0
4035
4036
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004037@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004038def CMDlint(parser, args):
4039 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004040 parser.add_option('--filter', action='append', metavar='-x,+y',
4041 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004042 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004043
4044 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004045 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004046 try:
4047 import cpplint
4048 import cpplint_chromium
4049 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004050 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004051 return 1
4052
4053 # Change the current working directory before calling lint so that it
4054 # shows the correct base.
4055 previous_cwd = os.getcwd()
4056 os.chdir(settings.GetRoot())
4057 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004058 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004059 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004060 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004062 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004063
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004064 # Process cpplint arguments, if any.
4065 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4066 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004067 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004068
Lei Zhang379d1ad2020-07-15 19:40:06 +00004069 include_regex = re.compile(settings.GetLintRegex())
4070 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004071 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4072 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004073 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004075 continue
4076
4077 if ignore_regex.match(filename):
4078 print('Ignoring file %s' % filename)
4079 continue
4080
4081 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4082 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004083 finally:
4084 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004085 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004086 if cpplint._cpplint_state.error_count != 0:
4087 return 1
4088 return 0
4089
4090
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004091@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004092def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004093 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004094 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004095 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004096 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004097 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004098 parser.add_option('--all', action='store_true',
4099 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004100 parser.add_option('--files',
4101 nargs=1,
4102 help='Semicolon-separated list of files to be marked as '
4103 'modified when executing presubmit or post-upload hooks. '
4104 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004105 parser.add_option('--parallel', action='store_true',
4106 help='Run all tests specified by input_api.RunTests in all '
4107 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004108 parser.add_option('--resultdb', action='store_true',
4109 help='Run presubmit checks in the ResultSink environment '
4110 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004111 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004112 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004113
sbc@chromium.org71437c02015-04-09 19:29:40 +00004114 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004115 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004116 return 1
4117
Edward Lemur934836a2019-09-09 20:16:54 +00004118 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004119 if args:
4120 base_branch = args[0]
4121 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004122 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004123 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004125 if cl.GetIssue():
4126 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004127 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004128 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004129
Bruce Dawson13acea32022-05-03 22:13:08 +00004130 if not base_branch:
4131 if not options.force:
4132 print('use --force to check even when not on a branch.')
4133 return 1
4134 base_branch = 'HEAD'
4135
Josip Sokcevic017544d2022-03-31 23:47:53 +00004136 cl.RunHook(committing=not options.upload,
4137 may_prompt=False,
4138 verbose=options.verbose,
4139 parallel=options.parallel,
4140 upstream=base_branch,
4141 description=description,
4142 all_files=options.all,
4143 files=options.files,
4144 resultdb=options.resultdb,
4145 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004146 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004147
4148
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004149def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004150 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004151
4152 Works the same way as
4153 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4154 but can be called on demand on all platforms.
4155
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004156 The basic idea is to generate git hash of a state of the tree, original
4157 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004158 """
4159 lines = []
4160 tree_hash = RunGitSilent(['write-tree'])
4161 lines.append('tree %s' % tree_hash.strip())
4162 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4163 if code == 0:
4164 lines.append('parent %s' % parent.strip())
4165 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4166 lines.append('author %s' % author.strip())
4167 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4168 lines.append('committer %s' % committer.strip())
4169 lines.append('')
4170 # Note: Gerrit's commit-hook actually cleans message of some lines and
4171 # whitespace. This code is not doing this, but it clearly won't decrease
4172 # entropy.
4173 lines.append(message)
4174 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004175 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004176 return 'I%s' % change_hash.strip()
4177
4178
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004179def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004180 """Computes the remote branch ref to use for the CL.
4181
4182 Args:
4183 remote (str): The git remote for the CL.
4184 remote_branch (str): The git remote branch for the CL.
4185 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004186 """
4187 if not (remote and remote_branch):
4188 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004189
wittman@chromium.org455dc922015-01-26 20:15:50 +00004190 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004191 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004192 # refs, which are then translated into the remote full symbolic refs
4193 # below.
4194 if '/' not in target_branch:
4195 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4196 else:
4197 prefix_replacements = (
4198 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4199 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4200 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4201 )
4202 match = None
4203 for regex, replacement in prefix_replacements:
4204 match = re.search(regex, target_branch)
4205 if match:
4206 remote_branch = target_branch.replace(match.group(0), replacement)
4207 break
4208 if not match:
4209 # This is a branch path but not one we recognize; use as-is.
4210 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004211 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004212 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004213 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004214 # Handle the refs that need to land in different refs.
4215 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004216
wittman@chromium.org455dc922015-01-26 20:15:50 +00004217 # Create the true path to the remote branch.
4218 # Does the following translation:
4219 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004220 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004221 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4222 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4223 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4224 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4225 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4226 'refs/heads/')
4227 elif remote_branch.startswith('refs/remotes/branch-heads'):
4228 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004229
wittman@chromium.org455dc922015-01-26 20:15:50 +00004230 return remote_branch
4231
4232
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004233def cleanup_list(l):
4234 """Fixes a list so that comma separated items are put as individual items.
4235
4236 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4237 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4238 """
4239 items = sum((i.split(',') for i in l), [])
4240 stripped_items = (i.strip() for i in items)
4241 return sorted(filter(None, stripped_items))
4242
4243
Aaron Gable4db38df2017-11-03 14:59:07 -07004244@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004245@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004246def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004247 """Uploads the current changelist to codereview.
4248
4249 Can skip dependency patchset uploads for a branch by running:
4250 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004251 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004252 git config --unset branch.branch_name.skip-deps-uploads
4253 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004254
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004255 If the name of the checked out branch starts with "bug-" or "fix-" followed
4256 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004257 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004258
4259 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004260 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004261 [git-cl] add support for hashtags
4262 Foo bar: implement foo
4263 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004264 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004265 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4266 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004267 parser.add_option('--bypass-watchlists', action='store_true',
4268 dest='bypass_watchlists',
4269 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004270 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004271 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004272 parser.add_option('--message', '-m', dest='message',
4273 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004274 parser.add_option('-b', '--bug',
4275 help='pre-populate the bug number(s) for this issue. '
4276 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004277 parser.add_option('--message-file', dest='message_file',
4278 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004279 parser.add_option('--title', '-t', dest='title',
4280 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004281 parser.add_option('-T', '--skip-title', action='store_true',
4282 dest='skip_title',
4283 help='Use the most recent commit message as the title of '
4284 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004285 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004286 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004287 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004288 parser.add_option('--tbrs',
4289 action='append', default=[],
4290 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004291 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004292 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004293 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004294 parser.add_option('--hashtag', dest='hashtags',
4295 action='append', default=[],
4296 help=('Gerrit hashtag for new CL; '
4297 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004298 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004299 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004300 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004301 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004302 metavar='TARGET',
4303 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004304 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004305 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004306 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004307 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004308 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004309 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004310 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004311 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4312 const='TBR', help='add a set of OWNERS to TBR')
4313 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4314 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004315 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004316 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004317 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004318 'implies --send-mail')
4319 parser.add_option('-d', '--cq-dry-run',
4320 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004321 help='Send the patchset to do a CQ dry run right after '
4322 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004323 parser.add_option(
4324 '-q',
4325 '--cq-quick-run',
4326 action='store_true',
4327 default=False,
4328 help='Send the patchset to do a CQ quick run right after '
4329 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4330 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004331 parser.add_option('--set-bot-commit', action='store_true',
4332 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004333 parser.add_option('--preserve-tryjobs', action='store_true',
4334 help='instruct the CQ to let tryjobs running even after '
4335 'new patchsets are uploaded instead of canceling '
4336 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004337 parser.add_option('--dependencies', action='store_true',
4338 help='Uploads CLs of all the local branches that depend on '
4339 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004340 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4341 help='Sends your change to the CQ after an approval. Only '
4342 'works on repos that have the Auto-Submit label '
4343 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004344 parser.add_option('--parallel', action='store_true',
4345 help='Run all tests specified by input_api.RunTests in all '
4346 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004347 parser.add_option('--no-autocc', action='store_true',
4348 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004349 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004350 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004351 parser.add_option('-R', '--retry-failed', action='store_true',
4352 help='Retry failed tryjobs from old patchset immediately '
4353 'after uploading new patchset. Cannot be used with '
4354 '--use-commit-queue or --cq-dry-run.')
4355 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4356 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004357 parser.add_option('--fixed', '-x',
4358 help='List of bugs that will be commented on and marked '
4359 'fixed (pre-populates "Fixed:" tag). Same format as '
4360 '-b option / "Bug:" tag. If fixing several issues, '
4361 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004362 parser.add_option('--edit-description', action='store_true', default=False,
4363 help='Modify description before upload. Cannot be used '
4364 'with --force. It is a noop when --no-squash is set '
4365 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004366 parser.add_option('--git-completion-helper', action="store_true",
4367 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004368 parser.add_option('--resultdb', action='store_true',
4369 help='Run presubmit checks in the ResultSink environment '
4370 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004371 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004372 parser.add_option('-o',
4373 '--push-options',
4374 action='append',
4375 default=[],
4376 help='Transmit the given string to the server when '
4377 'performing git push (pass-through). See git-push '
4378 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004379 parser.add_option('--no-add-changeid',
4380 action='store_true',
4381 dest='no_add_changeid',
4382 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004383
rmistry@google.com2dd99862015-06-22 12:22:18 +00004384 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004385 (options, args) = parser.parse_args(args)
4386
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004387 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004388 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4389 if opt.help != optparse.SUPPRESS_HELP))
4390 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004391
sbc@chromium.org71437c02015-04-09 19:29:40 +00004392 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004393 return 1
4394
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004395 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004396 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004397 options.cc = cleanup_list(options.cc)
4398
Josipe827b0f2020-01-30 00:07:20 +00004399 if options.edit_description and options.force:
4400 parser.error('Only one of --force and --edit-description allowed')
4401
tandriib80458a2016-06-23 12:20:07 -07004402 if options.message_file:
4403 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004404 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004405 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004406
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004407 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004408 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004409 options.use_commit_queue,
4410 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004411 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4412 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004413
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004414 if options.skip_title and options.title:
4415 parser.error('Only one of --title and --skip-title allowed.')
4416
Aaron Gableedbc4132017-09-11 13:22:28 -07004417 if options.use_commit_queue:
4418 options.send_mail = True
4419
Edward Lesmes0dd54822020-03-26 18:24:25 +00004420 if options.squash is None:
4421 # Load default for user, repo, squash=true, in this order.
4422 options.squash = settings.GetSquashGerritUploads()
4423
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004424 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004425 # Warm change details cache now to avoid RPCs later, reducing latency for
4426 # developers.
4427 if cl.GetIssue():
4428 cl._GetChangeDetail(
4429 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4430
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004431 if options.retry_failed and not cl.GetIssue():
4432 print('No previous patchsets, so --retry-failed has no effect.')
4433 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004434
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004435 # cl.GetMostRecentPatchset uses cached information, and can return the last
4436 # patchset before upload. Calling it here makes it clear that it's the
4437 # last patchset before upload. Note that GetMostRecentPatchset will fail
4438 # if no CL has been uploaded yet.
4439 if options.retry_failed:
4440 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004441
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004442 ret = cl.CMDUpload(options, args, orig_args)
4443
4444 if options.retry_failed:
4445 if ret != 0:
4446 print('Upload failed, so --retry-failed has no effect.')
4447 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004448 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004449 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004450 jobs = _filter_failed_for_retry(builds)
4451 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004452 print('No failed tryjobs, so --retry-failed has no effect.')
4453 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004454 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004455
4456 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004457
4458
Francois Dorayd42c6812017-05-30 15:10:20 -04004459@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004460@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004461def CMDsplit(parser, args):
4462 """Splits a branch into smaller branches and uploads CLs.
4463
4464 Creates a branch and uploads a CL for each group of files modified in the
4465 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004466 comment, the string '$directory', is replaced with the directory containing
4467 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004468 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004469 parser.add_option('-d', '--description', dest='description_file',
4470 help='A text file containing a CL description in which '
4471 '$directory will be replaced by each CL\'s directory.')
4472 parser.add_option('-c', '--comment', dest='comment_file',
4473 help='A text file containing a CL comment.')
4474 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004475 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004476 help='List the files and reviewers for each CL that would '
4477 'be created, but don\'t create branches or CLs.')
4478 parser.add_option('--cq-dry-run', action='store_true',
4479 help='If set, will do a cq dry run for each uploaded CL. '
4480 'Please be careful when doing this; more than ~10 CLs '
4481 'has the potential to overload our build '
4482 'infrastructure. Try to upload these not during high '
4483 'load times (usually 11-3 Mountain View time). Email '
4484 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004485 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4486 default=True,
4487 help='Sends your change to the CQ after an approval. Only '
4488 'works on repos that have the Auto-Submit label '
4489 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004490 options, _ = parser.parse_args(args)
4491
4492 if not options.description_file:
4493 parser.error('No --description flag specified.')
4494
4495 def WrappedCMDupload(args):
4496 return CMDupload(OptionParser(), args)
4497
Edward Lemur2c62b332020-03-12 22:12:33 +00004498 return split_cl.SplitCl(
4499 options.description_file, options.comment_file, Changelist,
4500 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4501 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004502
4503
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004504@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004505@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004507 """DEPRECATED: Used to commit the current changelist via git-svn."""
4508 message = ('git-cl no longer supports committing to SVN repositories via '
4509 'git-svn. You probably want to use `git cl land` instead.')
4510 print(message)
4511 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004512
4513
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004514@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004515@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004516def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004517 """Commits the current changelist via git.
4518
4519 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4520 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004521 """
4522 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4523 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004524 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004525 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004526 parser.add_option('--parallel', action='store_true',
4527 help='Run all tests specified by input_api.RunTests in all '
4528 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004529 parser.add_option('--resultdb', action='store_true',
4530 help='Run presubmit checks in the ResultSink environment '
4531 'and send results to the ResultDB database.')
4532 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004533 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004534
Edward Lemur934836a2019-09-09 20:16:54 +00004535 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004536
Robert Iannucci2e73d432018-03-14 01:10:47 -07004537 if not cl.GetIssue():
4538 DieWithError('You must upload the change first to Gerrit.\n'
4539 ' If you would rather have `git cl land` upload '
4540 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004541 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4542 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543
4544
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004545@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004546@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004548 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004549 parser.add_option('-b', dest='newbranch',
4550 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004551 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004552 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004554 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004555
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004556 group = optparse.OptionGroup(
4557 parser,
4558 'Options for continuing work on the current issue uploaded from a '
4559 'different clone (e.g. different machine). Must be used independently '
4560 'from the other options. No issue number should be specified, and the '
4561 'branch must have an issue number associated with it')
4562 group.add_option('--reapply', action='store_true', dest='reapply',
4563 help='Reset the branch and reapply the issue.\n'
4564 'CAUTION: This will undo any local changes in this '
4565 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004566
4567 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004568 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004569 parser.add_option_group(group)
4570
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004571 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004572
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004573 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004574 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004575 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004576 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004577 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004578
Edward Lemur934836a2019-09-09 20:16:54 +00004579 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004580 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004581 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004582
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004583 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004584 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004585 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004586
4587 RunGit(['reset', '--hard', upstream])
4588 if options.pull:
4589 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004590
Edward Lemur678a6842019-10-03 22:25:05 +00004591 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004592 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4593 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004594
4595 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004596 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004597
Edward Lemurf38bc172019-09-03 21:02:13 +00004598 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004599 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004600 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004601
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004602 # We don't want uncommitted changes mixed up with the patch.
4603 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004604 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004606 if options.newbranch:
4607 if options.force:
4608 RunGit(['branch', '-D', options.newbranch],
4609 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004610 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004611
Edward Lemur678a6842019-10-03 22:25:05 +00004612 cl = Changelist(
4613 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004614
Edward Lemur678a6842019-10-03 22:25:05 +00004615 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004616 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004617
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004618 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4619 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004620
4621
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004622def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004623 """Fetches the tree status and returns either 'open', 'closed',
4624 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004625 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004627 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004628 if status.find('closed') != -1 or status == '0':
4629 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004630
4631 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004632 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004633
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004635 return 'unset'
4636
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004637
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004638def GetTreeStatusReason():
4639 """Fetches the tree status from a json url and returns the message
4640 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004641 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004642 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004643 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644 status = json.loads(connection.read())
4645 connection.close()
4646 return status['message']
4647
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004648
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004649@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004651 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004652 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004653 status = GetTreeStatus()
4654 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004655 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004656 return 2
4657
vapiera7fbd5a2016-06-16 09:17:49 -07004658 print('The tree is %s' % status)
4659 print()
4660 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661 if status != 'open':
4662 return 1
4663 return 0
4664
4665
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004666@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004667def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004668 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4669 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004670 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004671 '-b', '--bot', action='append',
4672 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4673 'times to specify multiple builders. ex: '
4674 '"-b win_rel -b win_layout". See '
4675 'the try server waterfall for the builders name and the tests '
4676 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004677 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004678 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004679 help=('Buildbucket bucket to send the try requests. Format: '
4680 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004681 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004682 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004683 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004684 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004685 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004686 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004687 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004688 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004689 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004690 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004691 '-q',
4692 '--quick-run',
4693 action='store_true',
4694 default=False,
4695 help='trigger in quick run mode '
4696 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4697 'uick_run.md) (chromium only).')
4698 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004699 '--category', default='git_cl_try', help='Specify custom build category.')
4700 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004701 '--project',
4702 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004703 'in recipe to determine to which repository or directory to '
4704 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004706 '-p', '--property', dest='properties', action='append', default=[],
4707 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004708 'key2=value2 etc. The value will be treated as '
4709 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004710 'NOTE: using this may make your tryjob not usable for CQ, '
4711 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004712 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004713 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4714 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004715 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004716 parser.add_option(
4717 '-R', '--retry-failed', action='store_true', default=False,
4718 help='Retry failed jobs from the latest set of tryjobs. '
4719 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004720 parser.add_option(
4721 '-i', '--issue', type=int,
4722 help='Operate on this issue instead of the current branch\'s implicit '
4723 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004724 options, args = parser.parse_args(args)
4725
machenbach@chromium.org45453142015-09-15 08:45:22 +00004726 # Make sure that all properties are prop=value pairs.
4727 bad_params = [x for x in options.properties if '=' not in x]
4728 if bad_params:
4729 parser.error('Got properties with missing "=": %s' % bad_params)
4730
maruel@chromium.org15192402012-09-06 12:38:29 +00004731 if args:
4732 parser.error('Unknown arguments: %s' % args)
4733
Edward Lemur934836a2019-09-09 20:16:54 +00004734 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004735 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004736 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004737
Edward Lemurf38bc172019-09-03 21:02:13 +00004738 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004739 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004740
tandriie113dfd2016-10-11 10:20:12 -07004741 error_message = cl.CannotTriggerTryJobReason()
4742 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004743 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004744
Edward Lemur45768512020-03-02 19:03:14 +00004745 if options.bot:
4746 if options.retry_failed:
4747 parser.error('--bot is not compatible with --retry-failed.')
4748 if not options.bucket:
4749 parser.error('A bucket (e.g. "chromium/try") is required.')
4750
4751 triggered = [b for b in options.bot if 'triggered' in b]
4752 if triggered:
4753 parser.error(
4754 'Cannot schedule builds on triggered bots: %s.\n'
4755 'This type of bot requires an initial job from a parent (usually a '
4756 'builder). Schedule a job on the parent instead.\n' % triggered)
4757
4758 if options.bucket.startswith('.master'):
4759 parser.error('Buildbot masters are not supported.')
4760
4761 project, bucket = _parse_bucket(options.bucket)
4762 if project is None or bucket is None:
4763 parser.error('Invalid bucket: %s.' % options.bucket)
4764 jobs = sorted((project, bucket, bot) for bot in options.bot)
4765 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004766 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004767 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004768 if options.verbose:
4769 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004770 jobs = _filter_failed_for_retry(builds)
4771 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004772 print('There are no failed jobs in the latest set of jobs '
4773 '(patchset #%d), doing nothing.' % patchset)
4774 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004775 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004776 if num_builders > 10:
4777 confirm_or_exit('There are %d builders with failed builds.'
4778 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004779 elif options.quick_run:
4780 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4781 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004782 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004783 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004784 print('git cl try with no bots now defaults to CQ dry run.')
4785 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4786 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004787
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004788 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004789 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004790 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004791 except BuildbucketResponseException as ex:
4792 print('ERROR: %s' % ex)
4793 return 1
4794 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004795
4796
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004797@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004798def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004799 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004800 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004801 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004802 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004803 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004804 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004805 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004806 '--color', action='store_true', default=setup_color.IS_TTY,
4807 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004808 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004809 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4810 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004811 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004812 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004813 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004814 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004815 parser.add_option(
4816 '-i', '--issue', type=int,
4817 help='Operate on this issue instead of the current branch\'s implicit '
4818 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819 options, args = parser.parse_args(args)
4820 if args:
4821 parser.error('Unrecognized args: %s' % ' '.join(args))
4822
Edward Lemur934836a2019-09-09 20:16:54 +00004823 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004824 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004825 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004826
tandrii221ab252016-10-06 08:12:04 -07004827 patchset = options.patchset
4828 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004829 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004830 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004831 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004832 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004833 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004834 cl.GetIssue())
4835
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004836 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004837 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004838 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004839 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004840 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004841 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004842 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004843 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004844 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004845 return 0
4846
4847
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004848@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004849@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004850def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004851 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004852 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004853 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004854 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004855
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004856 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004857 if args:
4858 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004859 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004860 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004861 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004862 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004863
4864 # Clear configured merge-base, if there is one.
4865 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004866 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004867 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004868 return 0
4869
4870
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004871@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004872def CMDweb(parser, args):
4873 """Opens the current CL in the web browser."""
4874 _, args = parser.parse_args(args)
4875 if args:
4876 parser.error('Unrecognized args: %s' % ' '.join(args))
4877
4878 issue_url = Changelist().GetIssueURL()
4879 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004880 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004881 return 1
4882
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004883 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004884 # allows us to hide the "Created new window in existing browser session."
4885 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004886 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004887 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004888 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004889 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004890 os.open(os.devnull, os.O_RDWR)
4891 try:
4892 webbrowser.open(issue_url)
4893 finally:
4894 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004895 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004896 return 0
4897
4898
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004899@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004900def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004901 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004902 parser.add_option('-d', '--dry-run', action='store_true',
4903 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004904 parser.add_option(
4905 '-q',
4906 '--quick-run',
4907 action='store_true',
4908 help='trigger in quick run mode '
4909 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4910 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004911 parser.add_option('-c', '--clear', action='store_true',
4912 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004913 parser.add_option(
4914 '-i', '--issue', type=int,
4915 help='Operate on this issue instead of the current branch\'s implicit '
4916 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004917 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004918 if args:
4919 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004920 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4921 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004922
Edward Lemur934836a2019-09-09 20:16:54 +00004923 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004924 if not cl.GetIssue():
4925 parser.error('Must upload the issue first.')
4926
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004927 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004928 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004929 elif options.quick_run:
4930 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004931 elif options.dry_run:
4932 state = _CQState.DRY_RUN
4933 else:
4934 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004935 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004936 return 0
4937
4938
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004939@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004940def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004941 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004942 parser.add_option(
4943 '-i', '--issue', type=int,
4944 help='Operate on this issue instead of the current branch\'s implicit '
4945 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004946 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004947 if args:
4948 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004949 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004950 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004951 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004952 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004953 cl.CloseIssue()
4954 return 0
4955
4956
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004957@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004958def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004959 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004960 parser.add_option(
4961 '--stat',
4962 action='store_true',
4963 dest='stat',
4964 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004965 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004966 if args:
4967 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004968
Edward Lemur934836a2019-09-09 20:16:54 +00004969 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004970 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004971 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004972 if not issue:
4973 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004974
Aaron Gablea718c3e2017-08-28 17:47:28 -07004975 base = cl._GitGetBranchConfigValue('last-upload-hash')
4976 if not base:
4977 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4978 if not base:
4979 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4980 revision_info = detail['revisions'][detail['current_revision']]
4981 fetch_info = revision_info['fetch']['http']
4982 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4983 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004984
Aaron Gablea718c3e2017-08-28 17:47:28 -07004985 cmd = ['git', 'diff']
4986 if options.stat:
4987 cmd.append('--stat')
4988 cmd.append(base)
4989 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004990
4991 return 0
4992
4993
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004994@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004996 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004997 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004998 '--ignore-current',
4999 action='store_true',
5000 help='Ignore the CL\'s current reviewers and start from scratch.')
5001 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005002 '--ignore-self',
5003 action='store_true',
5004 help='Do not consider CL\'s author as an owners.')
5005 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006 '--no-color',
5007 action='store_true',
5008 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005009 parser.add_option(
5010 '--batch',
5011 action='store_true',
5012 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005013 # TODO: Consider moving this to another command, since other
5014 # git-cl owners commands deal with owners for a given CL.
5015 parser.add_option(
5016 '--show-all',
5017 action='store_true',
5018 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005019 options, args = parser.parse_args(args)
5020
Edward Lemur934836a2019-09-09 20:16:54 +00005021 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005022 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023
Yang Guo6e269a02019-06-26 11:17:02 +00005024 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005025 if len(args) == 0:
5026 print('No files specified for --show-all. Nothing to do.')
5027 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005028 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005029 for path in args:
5030 print('Owners for %s:' % path)
5031 print('\n'.join(
5032 ' - %s' % owner
5033 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005034 return 0
5035
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005036 if args:
5037 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005038 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005039 base_branch = args[0]
5040 else:
5041 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005042 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005043
Edward Lemur2c62b332020-03-12 22:12:33 +00005044 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005045
5046 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005047 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5048 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005049 return 0
5050
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005051 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005052 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005053 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005054 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005055 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005056 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005057 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005058
5059
Aiden Bennerc08566e2018-10-03 17:52:42 +00005060def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005061 """Generates a diff command."""
5062 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005063 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5064
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005065 if allow_prefix:
5066 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5067 # case that diff.noprefix is set in the user's git config.
5068 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5069 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005070 diff_cmd += ['--no-prefix']
5071
5072 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005073
5074 if args:
5075 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005076 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005077 diff_cmd.append(arg)
5078 else:
5079 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005080
5081 return diff_cmd
5082
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005083
Jamie Madill5e96ad12020-01-13 16:08:35 +00005084def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5085 """Runs clang-format-diff and sets a return value if necessary."""
5086
5087 if not clang_diff_files:
5088 return 0
5089
5090 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5091 # formatted. This is used to block during the presubmit.
5092 return_value = 0
5093
5094 # Locate the clang-format binary in the checkout
5095 try:
5096 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5097 except clang_format.NotFoundError as e:
5098 DieWithError(e)
5099
5100 if opts.full or settings.GetFormatFullByDefault():
5101 cmd = [clang_format_tool]
5102 if not opts.dry_run and not opts.diff:
5103 cmd.append('-i')
5104 if opts.dry_run:
5105 for diff_file in clang_diff_files:
5106 with open(diff_file, 'r') as myfile:
5107 code = myfile.read().replace('\r\n', '\n')
5108 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5109 stdout = stdout.replace('\r\n', '\n')
5110 if opts.diff:
5111 sys.stdout.write(stdout)
5112 if code != stdout:
5113 return_value = 2
5114 else:
5115 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5116 if opts.diff:
5117 sys.stdout.write(stdout)
5118 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005119 try:
5120 script = clang_format.FindClangFormatScriptInChromiumTree(
5121 'clang-format-diff.py')
5122 except clang_format.NotFoundError as e:
5123 DieWithError(e)
5124
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005125 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005126 if not opts.dry_run and not opts.diff:
5127 cmd.append('-i')
5128
5129 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005130 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005131
Edward Lesmes89624cd2020-04-06 17:51:56 +00005132 env = os.environ.copy()
5133 env['PATH'] = (
5134 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5135 stdout = RunCommand(
5136 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005137 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005138 if opts.diff:
5139 sys.stdout.write(stdout)
5140 if opts.dry_run and len(stdout) > 0:
5141 return_value = 2
5142
5143 return return_value
5144
5145
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005146def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5147 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5148 presubmit checks have failed (and returns 0 otherwise)."""
5149
5150 if not rust_diff_files:
5151 return 0
5152
5153 # Locate the rustfmt binary.
5154 try:
5155 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5156 except rustfmt.NotFoundError as e:
5157 DieWithError(e)
5158
5159 # TODO(crbug.com/1231317): Support formatting only the changed lines
5160 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5161 # https://github.com/emilio/rustfmt-format-diff
5162 cmd = [rustfmt_tool]
5163 if opts.dry_run:
5164 cmd.append('--check')
5165 cmd += rust_diff_files
5166 rustfmt_exitcode = subprocess2.call(cmd)
5167
5168 if opts.presubmit and rustfmt_exitcode != 0:
5169 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005170
5171 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005172
5173
Olivier Robin0a6b5442022-04-07 07:25:04 +00005174def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5175 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5176 that presubmit checks have failed (and returns 0 otherwise)."""
5177
5178 if not swift_diff_files:
5179 return 0
5180
5181 # Locate the swift-format binary.
5182 try:
5183 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5184 except swift_format.NotFoundError as e:
5185 DieWithError(e)
5186
5187 cmd = [swift_format_tool]
5188 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005189 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005190 else:
5191 cmd += ['format', '-i']
5192 cmd += swift_diff_files
5193 swift_format_exitcode = subprocess2.call(cmd)
5194
5195 if opts.presubmit and swift_format_exitcode != 0:
5196 return 2
5197
5198 return 0
5199
5200
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005201def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005202 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005203 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005204
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005205
enne@chromium.org555cfe42014-01-29 18:21:39 +00005206@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005207@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005208def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005209 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005210 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005211 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005212 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005213 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005214 parser.add_option('--full', action='store_true',
5215 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005216 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005217 parser.add_option('--dry-run', action='store_true',
5218 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005219 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005220 '--no-clang-format',
5221 dest='clang_format',
5222 action='store_false',
5223 default=True,
5224 help='Disables formatting of various file types using clang-format.')
5225 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005226 '--python',
5227 action='store_true',
5228 default=None,
5229 help='Enables python formatting on all python files.')
5230 parser.add_option(
5231 '--no-python',
5232 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005233 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005234 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005235 'If neither --python or --no-python are set, python files that have a '
5236 '.style.yapf file in an ancestor directory will be formatted. '
5237 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005238 parser.add_option(
5239 '--js',
5240 action='store_true',
5241 help='Format javascript code with clang-format. '
5242 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005243 parser.add_option('--diff', action='store_true',
5244 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005245 parser.add_option('--presubmit', action='store_true',
5246 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005247
5248 parser.add_option('--rust-fmt',
5249 dest='use_rust_fmt',
5250 action='store_true',
5251 default=rustfmt.IsRustfmtSupported(),
5252 help='Enables formatting of Rust file types using rustfmt.')
5253 parser.add_option(
5254 '--no-rust-fmt',
5255 dest='use_rust_fmt',
5256 action='store_false',
5257 help='Disables formatting of Rust file types using rustfmt.')
5258
Olivier Robin0a6b5442022-04-07 07:25:04 +00005259 parser.add_option(
5260 '--swift-format',
5261 dest='use_swift_format',
5262 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005263 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005264 help='Enables formatting of Swift file types using swift-format '
5265 '(macOS host only).')
5266 parser.add_option(
5267 '--no-swift-format',
5268 dest='use_swift_format',
5269 action='store_false',
5270 help='Disables formatting of Swift file types using swift-format.')
5271
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005272 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005273
Garrett Beaty91a6f332020-01-06 16:57:24 +00005274 if opts.python is not None and opts.no_python:
5275 raise parser.error('Cannot set both --python and --no-python')
5276 if opts.no_python:
5277 opts.python = False
5278
Daniel Chengc55eecf2016-12-30 03:11:02 -08005279 # Normalize any remaining args against the current path, so paths relative to
5280 # the current directory are still resolved as expected.
5281 args = [os.path.join(os.getcwd(), arg) for arg in args]
5282
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005283 # git diff generates paths against the root of the repository. Change
5284 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005285 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005286 if rel_base_path:
5287 os.chdir(rel_base_path)
5288
digit@chromium.org29e47272013-05-17 17:01:46 +00005289 # Grab the merge-base commit, i.e. the upstream commit of the current
5290 # branch when it was created or the last time it was rebased. This is
5291 # to cover the case where the user may have called "git fetch origin",
5292 # moving the origin branch to a newer commit, but hasn't rebased yet.
5293 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005294 upstream_branch = opts.upstream
5295 if not upstream_branch:
5296 cl = Changelist()
5297 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005298 if upstream_branch:
5299 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5300 upstream_commit = upstream_commit.strip()
5301
5302 if not upstream_commit:
5303 DieWithError('Could not find base commit for this branch. '
5304 'Are you in detached state?')
5305
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005306 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5307 diff_output = RunGit(changed_files_cmd)
5308 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005309 # Filter out files deleted by this CL
5310 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005311
Andreas Haas417d89c2020-02-06 10:24:27 +00005312 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005313 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005314
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005315 clang_diff_files = []
5316 if opts.clang_format:
5317 clang_diff_files = [
5318 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5319 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005320 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005321 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005322 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005323 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005324
Edward Lesmes50da7702020-03-30 19:23:43 +00005325 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005326
Jamie Madill5e96ad12020-01-13 16:08:35 +00005327 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5328 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005329
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005330 if opts.use_rust_fmt:
5331 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5332 upstream_commit)
5333 if rust_fmt_return_value == 2:
5334 return_value = 2
5335
Olivier Robin0a6b5442022-04-07 07:25:04 +00005336 if opts.use_swift_format:
5337 if sys.platform != 'darwin':
5338 DieWithError('swift-format is only supported on macOS.')
5339 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5340 upstream_commit)
5341 if swift_format_return_value == 2:
5342 return_value = 2
5343
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005344 # Similar code to above, but using yapf on .py files rather than clang-format
5345 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005346 py_explicitly_disabled = opts.python is not None and not opts.python
5347 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005348 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5349 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005350
Aiden Bennerc08566e2018-10-03 17:52:42 +00005351 # Used for caching.
5352 yapf_configs = {}
5353 for f in python_diff_files:
5354 # Find the yapf style config for the current file, defaults to depot
5355 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005356 _FindYapfConfigFile(f, yapf_configs, top_dir)
5357
5358 # Turn on python formatting by default if a yapf config is specified.
5359 # This breaks in the case of this repo though since the specified
5360 # style file is also the global default.
5361 if opts.python is None:
5362 filtered_py_files = []
5363 for f in python_diff_files:
5364 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5365 filtered_py_files.append(f)
5366 else:
5367 filtered_py_files = python_diff_files
5368
5369 # Note: yapf still seems to fix indentation of the entire file
5370 # even if line ranges are specified.
5371 # See https://github.com/google/yapf/issues/499
5372 if not opts.full and filtered_py_files:
5373 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5374
Brian Sheedyb4307d52019-12-02 19:18:17 +00005375 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5376 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5377 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005378
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005379 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005380 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5381 # Default to pep8 if not .style.yapf is found.
5382 if not yapf_style:
5383 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005384
Peter Wend9399922020-06-17 17:33:49 +00005385 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005386 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005387 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005388 else:
5389 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005390
5391 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005392
5393 has_formattable_lines = False
5394 if not opts.full:
5395 # Only run yapf over changed line ranges.
5396 for diff_start, diff_len in py_line_diffs[f]:
5397 diff_end = diff_start + diff_len - 1
5398 # Yapf errors out if diff_end < diff_start but this
5399 # is a valid line range diff for a removal.
5400 if diff_end >= diff_start:
5401 has_formattable_lines = True
5402 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5403 # If all line diffs were removals we have nothing to format.
5404 if not has_formattable_lines:
5405 continue
5406
5407 if opts.diff or opts.dry_run:
5408 cmd += ['--diff']
5409 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005410 stdout = RunCommand(cmd,
5411 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005412 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005413 cwd=top_dir,
5414 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005415 if opts.diff:
5416 sys.stdout.write(stdout)
5417 elif len(stdout) > 0:
5418 return_value = 2
5419 else:
5420 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005421 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005422
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005423 # Format GN build files. Always run on full build files for canonical form.
5424 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005425 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005426 if opts.dry_run or opts.diff:
5427 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005428 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005429 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005430 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005431 cwd=top_dir)
5432 if opts.dry_run and gn_ret == 2:
5433 return_value = 2 # Not formatted.
5434 elif opts.diff and gn_ret == 2:
5435 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005436 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005437 elif gn_ret != 0:
5438 # For non-dry run cases (and non-2 return values for dry-run), a
5439 # nonzero error code indicates a failure, probably because the file
5440 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005441 DieWithError('gn format failed on ' + gn_diff_file +
5442 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005443
Ilya Shermane081cbe2017-08-15 17:51:04 -07005444 # Skip the metrics formatting from the global presubmit hook. These files have
5445 # a separate presubmit hook that issues an error if the files need formatting,
5446 # whereas the top-level presubmit script merely issues a warning. Formatting
5447 # these files is somewhat slow, so it's important not to duplicate the work.
5448 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005449 for diff_xml in GetDiffXMLs(diff_files):
5450 xml_dir = GetMetricsDir(diff_xml)
5451 if not xml_dir:
5452 continue
5453
Ilya Shermane081cbe2017-08-15 17:51:04 -07005454 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005455 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5456 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005457
5458 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5459 # command as histograms/pretty_print.py now needs a relative path argument
5460 # after splitting the histograms into multiple directories.
5461 # For example, in tools/metrics/ukm, pretty-print could be run using:
5462 # $ python pretty_print.py
5463 # But in tools/metrics/histogrmas, pretty-print should be run with an
5464 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005465 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005466 # $ python pretty_print.py enums.xml
5467
5468 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5469 # version of histograms/pretty_print.py is released.
5470 filepath_required = os.path.exists(
5471 os.path.join(tool_dir, 'validate_prefix.py'))
5472
Weilun Shib92c4b72020-08-27 17:45:11 +00005473 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5474 or diff_xml.endswith('histogram_suffixes_list.xml')
5475 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005476 cmd.append(diff_xml)
5477
Ilya Shermane081cbe2017-08-15 17:51:04 -07005478 if opts.dry_run or opts.diff:
5479 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005480
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005481 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5482 # `shell` param and instead replace `'vpython'` with
5483 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005484 stdout = RunCommand(cmd,
5485 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005486 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005487 if opts.diff:
5488 sys.stdout.write(stdout)
5489 if opts.dry_run and stdout:
5490 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005491
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005492 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005493
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005494
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005495def GetDiffXMLs(diff_files):
5496 return [
5497 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5498 ]
5499
5500
5501def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005502 metrics_xml_dirs = [
5503 os.path.join('tools', 'metrics', 'actions'),
5504 os.path.join('tools', 'metrics', 'histograms'),
5505 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005506 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005507 os.path.join('tools', 'metrics', 'ukm'),
5508 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005509 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005510 if diff_xml.startswith(xml_dir):
5511 return xml_dir
5512 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005513
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005514
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005515@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005516@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005517def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005518 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005519 _, args = parser.parse_args(args)
5520
5521 if len(args) != 1:
5522 parser.print_help()
5523 return 1
5524
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005525 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005526 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005527 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005528
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005529 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005530
Edward Lemur52969c92020-02-06 18:15:28 +00005531 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005532 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005533 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005534
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005535 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005536 for key, issue in [x.split() for x in output.splitlines()]:
5537 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005538 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005539
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005540 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005541 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005542 return 1
5543 if len(branches) == 1:
5544 RunGit(['checkout', branches[0]])
5545 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005546 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005547 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005548 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005549 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005550 try:
5551 RunGit(['checkout', branches[int(which)]])
5552 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005553 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005554 return 1
5555
5556 return 0
5557
5558
maruel@chromium.org29404b52014-09-08 22:58:00 +00005559def CMDlol(parser, args):
5560 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005561 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005562 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5563 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5564 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005565 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005566 return 0
5567
5568
Josip Sokcevic0399e172022-03-21 23:11:51 +00005569def CMDversion(parser, args):
5570 import utils
5571 print(utils.depot_tools_version())
5572
5573
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005574class OptionParser(optparse.OptionParser):
5575 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005576
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005577 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005578 optparse.OptionParser.__init__(
5579 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005580 self.add_option(
5581 '-v', '--verbose', action='count', default=0,
5582 help='Use 2 times for more debugging info')
5583
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005584 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005585 try:
5586 return self._parse_args(args)
5587 finally:
5588 # Regardless of success or failure of args parsing, we want to report
5589 # metrics, but only after logging has been initialized (if parsing
5590 # succeeded).
5591 global settings
5592 settings = Settings()
5593
Edward Lesmes9c349062021-05-06 20:02:39 +00005594 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005595 # GetViewVCUrl ultimately calls logging method.
5596 project_url = settings.GetViewVCUrl().strip('/+')
5597 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5598 metrics.collector.add('project_urls', [project_url])
5599
5600 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005601 # Create an optparse.Values object that will store only the actual passed
5602 # options, without the defaults.
5603 actual_options = optparse.Values()
5604 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5605 # Create an optparse.Values object with the default options.
5606 options = optparse.Values(self.get_default_values().__dict__)
5607 # Update it with the options passed by the user.
5608 options._update_careful(actual_options.__dict__)
5609 # Store the options passed by the user in an _actual_options attribute.
5610 # We store only the keys, and not the values, since the values can contain
5611 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005612 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005613
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005614 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005615 logging.basicConfig(
5616 level=levels[min(options.verbose, len(levels) - 1)],
5617 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5618 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005619
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005620 return options, args
5621
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005622
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005623def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005624 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005625 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005626 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005627 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005628
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005629 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005630 dispatcher = subcommand.CommandDispatcher(__name__)
5631 try:
5632 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005633 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005634 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005635 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005636 if e.code != 500:
5637 raise
5638 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005639 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005640 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005641 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005642
5643
5644if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005645 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5646 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005647 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005648 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005649 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005650 sys.exit(main(sys.argv[1:]))