blob: eebf734e651308693028150df8c6533f9f85dd2f [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')
Edward Lemur227d5102020-02-25 23:45:35 +00001365
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001366 if resultdb and not realm:
1367 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1368 # it is not required to pass the realm flag
1369 print('Note: ResultDB reporting will NOT be performed because --realm'
1370 ' was not specified. To enable ResultDB, please run the command'
1371 ' again with the --realm argument to specify the LUCI realm.')
1372
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001373 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1374 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001375 if py3_results.get('skipped_presubmits', 1) == 0:
1376 print('No more presubmits to run - skipping Python 2 presubmits.')
1377 return py3_results
1378
1379 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1380 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001381 return self._MergePresubmitResults(py2_results, py3_results)
1382
1383 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1384 args = args[:]
1385 vpython = 'vpython3' if use_python3 else 'vpython'
1386
Edward Lemur227d5102020-02-25 23:45:35 +00001387 with gclient_utils.temporary_file() as description_file:
1388 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001389 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001390 args.extend(['--json_output', json_output])
1391 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001392 if self.GetUsePython3():
1393 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001394 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001395 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001396 if resultdb and realm:
1397 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001398
1399 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001400 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001401
Edward Lemur227d5102020-02-25 23:45:35 +00001402 metrics.collector.add_repeated('sub_commands', {
1403 'command': 'presubmit',
1404 'execution_time': time_time() - start,
1405 'exit_code': exit_code,
1406 })
1407
1408 if exit_code:
1409 sys.exit(exit_code)
1410
1411 json_results = gclient_utils.FileRead(json_output)
1412 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001413
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001414 def _MergePresubmitResults(self, py2_results, py3_results):
1415 return {
1416 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1417 py3_results.get('more_cc', []))),
1418 'errors': (
1419 py2_results.get('errors', []) + py3_results.get('errors', [])),
1420 'notifications': (
1421 py2_results.get('notifications', []) +
1422 py3_results.get('notifications', [])),
1423 'warnings': (
1424 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1425 }
1426
Edward Lemur75526302020-02-27 22:31:05 +00001427 def RunPostUploadHook(self, verbose, upstream, description):
1428 args = self._GetCommonPresubmitArgs(verbose, upstream)
1429 args.append('--post_upload')
1430
1431 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001432 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001433 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001434 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1435 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1436 ['--use-python3'])
1437 p_py2.wait()
1438 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001439
Edward Lemur5a644f82020-03-18 16:44:57 +00001440 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1441 # Get description message for upload.
1442 if self.GetIssue():
1443 description = self.FetchDescription()
1444 elif options.message:
1445 description = options.message
1446 else:
1447 description = _create_description_from_log(git_diff_args)
1448 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001449 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001450
Edward Lemur5a644f82020-03-18 16:44:57 +00001451 bug = options.bug
1452 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001453 if not self.GetIssue():
1454 # Extract bug number from branch name, but only if issue is being created.
1455 # It must start with bug or fix, followed by _ or - and number.
1456 # Optionally, it may contain _ or - after number with arbitrary text.
1457 # Examples:
1458 # bug-123
1459 # bug_123
1460 # fix-123
1461 # fix-123-some-description
1462 match = re.match(
1463 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1464 self.GetBranch())
1465 if not bug and not fixed and match:
1466 if match.group('type') == 'bug':
1467 bug = match.group('bugnum')
1468 else:
1469 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001470
1471 change_description = ChangeDescription(description, bug, fixed)
1472
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001473 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1474 if options.add_owners_to:
1475 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001476 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001477 files, [], options.tbrs + options.reviewers)
1478 missing_files = [
1479 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001480 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001481 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001482 owners = self.owners_client.SuggestOwners(
1483 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001484 if options.add_owners_to == 'TBR':
1485 assert isinstance(options.tbrs, list), options.tbrs
1486 options.tbrs.extend(owners)
1487 else:
1488 assert isinstance(options.reviewers, list), options.reviewers
1489 options.reviewers.extend(owners)
1490
Edward Lemur5a644f82020-03-18 16:44:57 +00001491 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001492 if options.reviewers or options.tbrs:
1493 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001494
1495 return change_description
1496
1497 def _GetTitleForUpload(self, options):
1498 # When not squashing, just return options.title.
1499 if not options.squash:
1500 return options.title
1501
1502 # On first upload, patchset title is always this string, while options.title
1503 # gets converted to first line of message.
1504 if not self.GetIssue():
1505 return 'Initial upload'
1506
1507 # When uploading subsequent patchsets, options.message is taken as the title
1508 # if options.title is not provided.
1509 if options.title:
1510 return options.title
1511 if options.message:
1512 return options.message.strip()
1513
1514 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001515 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001516 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001517 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001518 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001519
1520 # Use the default title if the user confirms the default with a 'y'.
1521 if user_title.lower() == 'y':
1522 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001523 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001524
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001525 def CMDUpload(self, options, git_diff_args, orig_args):
1526 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001527 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001528 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001529 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001530 else:
1531 if self.GetBranch() is None:
1532 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1533
1534 # Default to diffing against common ancestor of upstream branch
1535 base_branch = self.GetCommonAncestorWithUpstream()
1536 git_diff_args = [base_branch, 'HEAD']
1537
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001538 # Fast best-effort checks to abort before running potentially expensive
1539 # hooks if uploading is likely to fail anyway. Passing these checks does
1540 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001541 self.EnsureAuthenticated(force=options.force)
1542 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543
1544 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001545 watchlist = watchlists.Watchlists(settings.GetRoot())
1546 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001548 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549
Edward Lemur5a644f82020-03-18 16:44:57 +00001550 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001551 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001552 hook_results = self.RunHook(
1553 committing=False,
1554 may_prompt=not options.force,
1555 verbose=options.verbose,
1556 parallel=options.parallel,
1557 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001558 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001559 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001560 resultdb=options.resultdb,
1561 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001562 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563
Aaron Gable13101a62018-02-09 13:20:41 -08001564 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001565 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001566 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001567 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001568 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001569 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001570 # Run post upload hooks, if specified.
1571 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001572 self.RunPostUploadHook(
1573 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001574
1575 # Upload all dependencies if specified.
1576 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001577 print()
1578 print('--dependencies has been specified.')
1579 print('All dependent local branches will be re-uploaded.')
1580 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001581 # Remove the dependencies flag from args so that we do not end up in a
1582 # loop.
1583 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001584 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001585 return ret
1586
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001587 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001588 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001589
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001590 Issue must have been already uploaded and known. Optionally allows for
1591 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001592 """
1593 assert new_state in _CQState.ALL_STATES
1594 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001595 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001596 vote_map = {
1597 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001598 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001599 _CQState.DRY_RUN: 1,
1600 _CQState.COMMIT: 2,
1601 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001602 if new_state == _CQState.QUICK_RUN:
1603 labels = {
1604 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1605 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1606 }
1607 else:
1608 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001609 notify = False if new_state == _CQState.DRY_RUN else None
1610 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001611 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001612 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001613 return 0
1614 except KeyboardInterrupt:
1615 raise
1616 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001617 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001618 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001619 ' * Your project has no CQ,\n'
1620 ' * You don\'t have permission to change the CQ state,\n'
1621 ' * There\'s a bug in this code (see stack trace below).\n'
1622 'Consider specifying which bots to trigger manually or asking your '
1623 'project owners for permissions or contacting Chrome Infra at:\n'
1624 'https://www.chromium.org/infra\n\n' %
1625 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001626 # Still raise exception so that stack trace is printed.
1627 raise
1628
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001629 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001630 # Lazy load of configs.
1631 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001632 if self._gerrit_host and '.' not in self._gerrit_host:
1633 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1634 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001635 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001636 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001637 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001638 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001639 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1640 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001641 return self._gerrit_host
1642
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001643 def _GetGitHost(self):
1644 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001645 remote_url = self.GetRemoteUrl()
1646 if not remote_url:
1647 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001648 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001649
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001650 def GetCodereviewServer(self):
1651 if not self._gerrit_server:
1652 # If we're on a branch then get the server potentially associated
1653 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001654 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001655 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001656 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001657 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001658 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659 if not self._gerrit_server:
1660 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1661 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001662 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001663 parts[0] = parts[0] + '-review'
1664 self._gerrit_host = '.'.join(parts)
1665 self._gerrit_server = 'https://%s' % self._gerrit_host
1666 return self._gerrit_server
1667
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001668 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001669 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001670 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001671 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001672 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001673 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001674 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001675 if project.endswith('.git'):
1676 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001677 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1678 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1679 # gitiles/git-over-https protocol. E.g.,
1680 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1681 # as
1682 # https://chromium.googlesource.com/v8/v8
1683 if project.startswith('a/'):
1684 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001685 return project
1686
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001687 def _GerritChangeIdentifier(self):
1688 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1689
1690 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001691 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001692 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001693 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001694 if project:
1695 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1696 # Fall back on still unique, but less efficient change number.
1697 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001698
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001699 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001700 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001701 if settings.GetGerritSkipEnsureAuthenticated():
1702 # For projects with unusual authentication schemes.
1703 # See http://crbug.com/603378.
1704 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001705
1706 # Check presence of cookies only if using cookies-based auth method.
1707 cookie_auth = gerrit_util.Authenticator.get()
1708 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001709 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001710
Florian Mayerae510e82020-01-30 21:04:48 +00001711 remote_url = self.GetRemoteUrl()
1712 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001713 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001714 return
1715 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001716 logging.warning('Ignoring branch %(branch)s with non-https remote '
1717 '%(remote)s', {
1718 'branch': self.branch,
1719 'remote': self.GetRemoteUrl()
1720 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001721 return
1722
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001723 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001724 self.GetCodereviewServer()
1725 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001726 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001727
1728 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1729 git_auth = cookie_auth.get_auth_header(git_host)
1730 if gerrit_auth and git_auth:
1731 if gerrit_auth == git_auth:
1732 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001733 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001734 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001735 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001736 ' %s\n'
1737 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001738 ' Consider running the following command:\n'
1739 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001740 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001741 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001742 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001743 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001744 cookie_auth.get_new_password_message(git_host)))
1745 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001746 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001747 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001748
1749 missing = (
1750 ([] if gerrit_auth else [self._gerrit_host]) +
1751 ([] if git_auth else [git_host]))
1752 DieWithError('Credentials for the following hosts are required:\n'
1753 ' %s\n'
1754 'These are read from %s (or legacy %s)\n'
1755 '%s' % (
1756 '\n '.join(missing),
1757 cookie_auth.get_gitcookies_path(),
1758 cookie_auth.get_netrc_path(),
1759 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001760
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001761 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001762 if not self.GetIssue():
1763 return
1764
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001765 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001766 if status == 'ABANDONED':
1767 DieWithError(
1768 'Change %s has been abandoned, new uploads are not allowed' %
1769 (self.GetIssueURL()))
1770 if status == 'MERGED':
1771 answer = gclient_utils.AskForData(
1772 'Change %s has been submitted, new uploads are not allowed. '
1773 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1774 ).lower()
1775 if answer not in ('y', ''):
1776 DieWithError('New uploads are not allowed.')
1777 self.SetIssue()
1778 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001779
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001780 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1781 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1782 # Apparently this check is not very important? Otherwise get_auth_email
1783 # could have been added to other implementations of Authenticator.
1784 cookies_auth = gerrit_util.Authenticator.get()
1785 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001786 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001787
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001788 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001789 if self.GetIssueOwner() == cookies_user:
1790 return
1791 logging.debug('change %s owner is %s, cookies user is %s',
1792 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001793 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001794 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001795 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001796 if details['email'] == self.GetIssueOwner():
1797 return
1798 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001799 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001800 'as %s.\n'
1801 'Uploading may fail due to lack of permissions.' %
1802 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1803 confirm_or_exit(action='upload')
1804
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001805 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001806 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001807 or CQ status, assuming adherence to a common workflow.
1808
1809 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001810 * 'error' - error from review tool (including deleted issues)
1811 * 'unsent' - no reviewers added
1812 * 'waiting' - waiting for review
1813 * 'reply' - waiting for uploader to reply to review
1814 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001815 * 'dry-run' - dry-running in the CQ
1816 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001817 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001818 """
1819 if not self.GetIssue():
1820 return None
1821
1822 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001823 data = self._GetChangeDetail([
1824 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001825 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001826 return 'error'
1827
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001828 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001829 return 'closed'
1830
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001831 cq_label = data['labels'].get('Commit-Queue', {})
1832 max_cq_vote = 0
1833 for vote in cq_label.get('all', []):
1834 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1835 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001836 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001837 if max_cq_vote == 1:
1838 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001839
Aaron Gable9ab38c62017-04-06 14:36:33 -07001840 if data['labels'].get('Code-Review', {}).get('approved'):
1841 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001842
1843 if not data.get('reviewers', {}).get('REVIEWER', []):
1844 return 'unsent'
1845
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001846 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001847 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001848 while messages:
1849 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001850 if (m.get('tag', '').startswith('autogenerated:cq') or
1851 m.get('tag', '').startswith('autogenerated:cv')):
1852 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001853 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001854 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001855 # Most recent message was by owner.
1856 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001857
1858 # Some reply from non-owner.
1859 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001860
1861 # Somehow there are no messages even though there are reviewers.
1862 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001863
1864 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001865 if not self.GetIssue():
1866 return None
1867
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001868 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001869 patchset = data['revisions'][data['current_revision']]['_number']
1870 self.SetPatchset(patchset)
1871 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001872
Gavin Make61ccc52020-11-13 00:12:57 +00001873 def GetMostRecentDryRunPatchset(self):
1874 """Get patchsets equivalent to the most recent patchset and return
1875 the patchset with the latest dry run. If none have been dry run, return
1876 the latest patchset."""
1877 if not self.GetIssue():
1878 return None
1879
1880 data = self._GetChangeDetail(['ALL_REVISIONS'])
1881 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001882 dry_run = {int(m['_revision_number'])
1883 for m in data.get('messages', [])
1884 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001885
1886 for revision_info in sorted(data.get('revisions', {}).values(),
1887 key=lambda c: c['_number'], reverse=True):
1888 if revision_info['_number'] in dry_run:
1889 patchset = revision_info['_number']
1890 break
1891 if revision_info.get('kind', '') not in \
1892 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1893 break
1894 self.SetPatchset(patchset)
1895 return patchset
1896
Aaron Gable636b13f2017-07-14 10:42:48 -07001897 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001898 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001899 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001900 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001901
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001902 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001903 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001904 # CURRENT_REVISION is included to get the latest patchset so that
1905 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001906 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001907 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1908 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001909 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001910 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001911 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001912 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913
1914 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001915 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001916 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001917 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001918 line_comments = file_comments.setdefault(path, [])
1919 line_comments.extend(
1920 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001921
1922 # Build dictionary of file comments for easy access and sorting later.
1923 # {author+date: {path: {patchset: {line: url+message}}}}
1924 comments = collections.defaultdict(
1925 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001926
1927 server = self.GetCodereviewServer()
1928 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1929 # /c/ is automatically added by short URL server.
1930 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1931 self.GetIssue())
1932 else:
1933 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1934
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001935 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001936 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001937 tag = comment.get('tag', '')
1938 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001939 continue
1940 key = (comment['author']['email'], comment['updated'])
1941 if comment.get('side', 'REVISION') == 'PARENT':
1942 patchset = 'Base'
1943 else:
1944 patchset = 'PS%d' % comment['patch_set']
1945 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001946 url = ('%s/%s/%s#%s%s' %
1947 (url_prefix, comment['patch_set'], path,
1948 'b' if comment.get('side') == 'PARENT' else '',
1949 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001950 comments[key][path][patchset][line] = (url, comment['message'])
1951
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001952 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001953 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001954 summary = self._BuildCommentSummary(msg, comments, readable)
1955 if summary:
1956 summaries.append(summary)
1957 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001958
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001959 @staticmethod
1960 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001961 if 'email' not in msg['author']:
1962 # Some bot accounts may not have an email associated.
1963 return None
1964
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001965 key = (msg['author']['email'], msg['date'])
1966 # Don't bother showing autogenerated messages that don't have associated
1967 # file or line comments. this will filter out most autogenerated
1968 # messages, but will keep robot comments like those from Tricium.
1969 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1970 if is_autogenerated and not comments.get(key):
1971 return None
1972 message = msg['message']
1973 # Gerrit spits out nanoseconds.
1974 assert len(msg['date'].split('.')[-1]) == 9
1975 date = datetime.datetime.strptime(msg['date'][:-3],
1976 '%Y-%m-%d %H:%M:%S.%f')
1977 if key in comments:
1978 message += '\n'
1979 for path, patchsets in sorted(comments.get(key, {}).items()):
1980 if readable:
1981 message += '\n%s' % path
1982 for patchset, lines in sorted(patchsets.items()):
1983 for line, (url, content) in sorted(lines.items()):
1984 if line:
1985 line_str = 'Line %d' % line
1986 path_str = '%s:%d:' % (path, line)
1987 else:
1988 line_str = 'File comment'
1989 path_str = '%s:0:' % path
1990 if readable:
1991 message += '\n %s, %s: %s' % (patchset, line_str, url)
1992 message += '\n %s\n' % content
1993 else:
1994 message += '\n%s ' % path_str
1995 message += '\n%s\n' % content
1996
1997 return _CommentSummary(
1998 date=date,
1999 message=message,
2000 sender=msg['author']['email'],
2001 autogenerated=is_autogenerated,
2002 # These could be inferred from the text messages and correlated with
2003 # Code-Review label maximum, however this is not reliable.
2004 # Leaving as is until the need arises.
2005 approval=False,
2006 disapproval=False,
2007 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002008
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002009 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002010 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002011 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002012
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002013 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002014 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002015 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002016
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002017 def _GetChangeDetail(self, options=None):
2018 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002019 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002020 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002021
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002022 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002023 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002024 options.append('CURRENT_COMMIT')
2025
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002026 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002027 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002028 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002029
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002030 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2031 # Assumption: data fetched before with extra options is suitable
2032 # for return for a smaller set of options.
2033 # For example, if we cached data for
2034 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2035 # and request is for options=[CURRENT_REVISION],
2036 # THEN we can return prior cached data.
2037 if options_set.issubset(cached_options_set):
2038 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002039
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002040 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002041 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002042 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002043 except gerrit_util.GerritError as e:
2044 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002045 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002046 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002047
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002048 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002049 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002050
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002051 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002052 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002053 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002054 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002055 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002056 except gerrit_util.GerritError as e:
2057 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002058 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002059 raise
agable32978d92016-11-01 12:55:02 -07002060 return data
2061
Karen Qian40c19422019-03-13 21:28:29 +00002062 def _IsCqConfigured(self):
2063 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002064 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002065
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002066 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002067 if git_common.is_dirty_git_tree('land'):
2068 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002069
tandriid60367b2016-06-22 05:25:12 -07002070 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002071 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002072 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002073 'which can test and land changes for you. '
2074 'Are you sure you wish to bypass it?\n',
2075 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002076 differs = True
tandriic4344b52016-08-29 06:04:54 -07002077 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002078 # Note: git diff outputs nothing if there is no diff.
2079 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002080 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002081 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002082 if detail['current_revision'] == last_upload:
2083 differs = False
2084 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002085 print('WARNING: Local branch contents differ from latest uploaded '
2086 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002087 if differs:
2088 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002089 confirm_or_exit(
2090 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2091 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002092 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002093 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002094 upstream = self.GetCommonAncestorWithUpstream()
2095 if self.GetIssue():
2096 description = self.FetchDescription()
2097 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002098 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002099 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002100 committing=True,
2101 may_prompt=not force,
2102 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002103 parallel=parallel,
2104 upstream=upstream,
2105 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002106 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002107 resultdb=resultdb,
2108 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002109
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002110 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002111 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002112 links = self._GetChangeCommit().get('web_links', [])
2113 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002114 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002115 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002116 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 return 0
2118
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002119 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2120 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002121 assert parsed_issue_arg.valid
2122
Edward Lemur125d60a2019-09-13 18:25:41 +00002123 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002124
2125 if parsed_issue_arg.hostname:
2126 self._gerrit_host = parsed_issue_arg.hostname
2127 self._gerrit_server = 'https://%s' % self._gerrit_host
2128
tandriic2405f52016-10-10 08:13:15 -07002129 try:
2130 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002131 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002132 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133
2134 if not parsed_issue_arg.patchset:
2135 # Use current revision by default.
2136 revision_info = detail['revisions'][detail['current_revision']]
2137 patchset = int(revision_info['_number'])
2138 else:
2139 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002140 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2142 break
2143 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002144 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002145 (parsed_issue_arg.patchset, self.GetIssue()))
2146
Edward Lemur125d60a2019-09-13 18:25:41 +00002147 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002148 if remote_url.endswith('.git'):
2149 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002150 remote_url = remote_url.rstrip('/')
2151
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002153 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002154
2155 if remote_url != fetch_info['url']:
2156 DieWithError('Trying to patch a change from %s but this repo appears '
2157 'to be %s.' % (fetch_info['url'], remote_url))
2158
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002160
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002161 # If we have created a new branch then do the "set issue" immediately in
2162 # case the cherry-pick fails, which happens when resolving conflicts.
2163 if newbranch:
2164 self.SetIssue(parsed_issue_arg.issue)
2165
Aaron Gable62619a32017-06-16 08:22:09 -07002166 if force:
2167 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2168 print('Checked out commit for change %i patchset %i locally' %
2169 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002170 elif nocommit:
2171 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2172 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002173 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002174 RunGit(['cherry-pick', 'FETCH_HEAD'])
2175 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002176 (parsed_issue_arg.issue, patchset))
2177 print('Note: this created a local commit which does not have '
2178 'the same hash as the one uploaded for review. This will make '
2179 'uploading changes based on top of this branch difficult.\n'
2180 'If you want to do that, use "git cl patch --force" instead.')
2181
Stefan Zagerd08043c2017-10-12 12:07:02 -07002182 if self.GetBranch():
2183 self.SetIssue(parsed_issue_arg.issue)
2184 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002185 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002186 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2187 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2188 else:
2189 print('WARNING: You are in detached HEAD state.\n'
2190 'The patch has been applied to your checkout, but you will not be '
2191 'able to upload a new patch set to the gerrit issue.\n'
2192 'Try using the \'-b\' option if you would like to work on a '
2193 'branch and/or upload a new patch set.')
2194
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002195 return 0
2196
tandrii16e0b4e2016-06-07 10:34:28 -07002197 def _GerritCommitMsgHookCheck(self, offer_removal):
2198 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2199 if not os.path.exists(hook):
2200 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002201 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2202 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002203 data = gclient_utils.FileRead(hook)
2204 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2205 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002206 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002207 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002208 'and may interfere with it in subtle ways.\n'
2209 'We recommend you remove the commit-msg hook.')
2210 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002211 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002212 gclient_utils.rm_file_or_tree(hook)
2213 print('Gerrit commit-msg hook removed.')
2214 else:
2215 print('OK, will keep Gerrit commit-msg hook in place.')
2216
Edward Lemur1b52d872019-05-09 21:12:12 +00002217 def _CleanUpOldTraces(self):
2218 """Keep only the last |MAX_TRACES| traces."""
2219 try:
2220 traces = sorted([
2221 os.path.join(TRACES_DIR, f)
2222 for f in os.listdir(TRACES_DIR)
2223 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2224 and not f.startswith('tmp'))
2225 ])
2226 traces_to_delete = traces[:-MAX_TRACES]
2227 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002228 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 except OSError:
2230 print('WARNING: Failed to remove old git traces from\n'
2231 ' %s'
2232 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002233
Edward Lemur5737f022019-05-17 01:24:00 +00002234 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002235 """Zip and write the git push traces stored in traces_dir."""
2236 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002237 traces_zip = trace_name + '-traces'
2238 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002239 # Create a temporary dir to store git config and gitcookies in. It will be
2240 # compressed and stored next to the traces.
2241 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002242 git_info_zip = trace_name + '-git-info'
2243
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002244 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002245
Edward Lemur1b52d872019-05-09 21:12:12 +00002246 git_push_metadata['trace_name'] = trace_name
2247 gclient_utils.FileWrite(
2248 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2249
2250 # Keep only the first 6 characters of the git hashes on the packet
2251 # trace. This greatly decreases size after compression.
2252 packet_traces = os.path.join(traces_dir, 'trace-packet')
2253 if os.path.isfile(packet_traces):
2254 contents = gclient_utils.FileRead(packet_traces)
2255 gclient_utils.FileWrite(
2256 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2257 shutil.make_archive(traces_zip, 'zip', traces_dir)
2258
2259 # Collect and compress the git config and gitcookies.
2260 git_config = RunGit(['config', '-l'])
2261 gclient_utils.FileWrite(
2262 os.path.join(git_info_dir, 'git-config'),
2263 git_config)
2264
2265 cookie_auth = gerrit_util.Authenticator.get()
2266 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2267 gitcookies_path = cookie_auth.get_gitcookies_path()
2268 if os.path.isfile(gitcookies_path):
2269 gitcookies = gclient_utils.FileRead(gitcookies_path)
2270 gclient_utils.FileWrite(
2271 os.path.join(git_info_dir, 'gitcookies'),
2272 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2273 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2274
Edward Lemur1b52d872019-05-09 21:12:12 +00002275 gclient_utils.rmtree(git_info_dir)
2276
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002277 def _RunGitPushWithTraces(self,
2278 refspec,
2279 refspec_opts,
2280 git_push_metadata,
2281 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002282 """Run git push and collect the traces resulting from the execution."""
2283 # Create a temporary directory to store traces in. Traces will be compressed
2284 # and stored in a 'traces' dir inside depot_tools.
2285 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002286 trace_name = os.path.join(
2287 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002288
2289 env = os.environ.copy()
2290 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2291 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002292 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002293 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2294 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2295 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2296
2297 try:
2298 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002299 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002300 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002301 push_cmd = ['git', 'push', remote_url, refspec]
2302 if git_push_options:
2303 for opt in git_push_options:
2304 push_cmd.extend(['-o', opt])
2305
Edward Lemur0f58ae42019-04-30 17:24:12 +00002306 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002307 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002308 env=env,
2309 print_stdout=True,
2310 # Flush after every line: useful for seeing progress when running as
2311 # recipe.
2312 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002313 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002314 except subprocess2.CalledProcessError as e:
2315 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002316 if 'blocked keyword' in str(e.stdout):
2317 raise GitPushError(
2318 'Failed to create a change, very likely due to blocked keyword. '
2319 'Please examine output above for the reason of the failure.\n'
2320 'If this is a false positive, you can try to bypass blocked '
2321 'keyword by using push option '
2322 '-o uploadvalidator~skip, e.g.:\n'
2323 'git cl upload -o uploadvalidator~skip\n\n'
2324 'If git-cl is not working correctly, file a bug under the '
2325 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002326 if 'git push -o nokeycheck' in str(e.stdout):
2327 raise GitPushError(
2328 'Failed to create a change, very likely due to a private key being '
2329 'detected. Please examine output above for the reason of the '
2330 'failure.\n'
2331 'If this is a false positive, you can try to bypass private key '
2332 'detection by using push option '
2333 '-o nokeycheck, e.g.:\n'
2334 'git cl upload -o nokeycheck\n\n'
2335 'If git-cl is not working correctly, file a bug under the '
2336 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002337
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002338 raise GitPushError(
2339 'Failed to create a change. Please examine output above for the '
2340 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002341 'For emergencies, Googlers can escalate to '
2342 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002343 'Hint: run command below to diagnose common Git/Gerrit '
2344 'credential problems:\n'
2345 ' git cl creds-check\n'
2346 '\n'
2347 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2348 'component including the files below.\n'
2349 'Review the files before upload, since they might contain sensitive '
2350 'information.\n'
2351 'Set the Restrict-View-Google label so that they are not publicly '
2352 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002353 finally:
2354 execution_time = time_time() - before_push
2355 metrics.collector.add_repeated('sub_commands', {
2356 'command': 'git push',
2357 'execution_time': execution_time,
2358 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002359 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002360 })
2361
Edward Lemur1b52d872019-05-09 21:12:12 +00002362 git_push_metadata['execution_time'] = execution_time
2363 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002364 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002365
Edward Lemur1b52d872019-05-09 21:12:12 +00002366 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002367 gclient_utils.rmtree(traces_dir)
2368
2369 return push_stdout
2370
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002371 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2372 change_desc):
2373 """Upload the current branch to Gerrit, retry if new remote HEAD is
2374 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002375 remote, remote_branch = self.GetRemoteBranch()
2376 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2377
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002378 try:
2379 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002380 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002381 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002382 # Repository might be in the middle of transition to main branch as
2383 # default, and uploads to old default might be blocked.
2384 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002385 DieWithError(str(e), change_desc)
2386
Josip Sokcevicb631a882021-01-06 18:18:10 +00002387 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2388 self.GetGerritProject())
2389 if project_head == branch:
2390 DieWithError(str(e), change_desc)
2391 branch = project_head
2392
2393 print("WARNING: Fetching remote state and retrying upload to default "
2394 "branch...")
2395 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002396 options.edit_description = False
2397 options.force = True
2398 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002399 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2400 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002401 except GitPushError as e:
2402 DieWithError(str(e), change_desc)
2403
2404 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002405 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002407 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002408 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002410 # User requested to change description
2411 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002412 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002414 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002415 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002416 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002417 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002418 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002419 if len(change_ids) == 1:
2420 change_id = change_ids[0]
2421 else:
2422 change_id = GenerateGerritChangeId(change_desc.description)
2423 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002425 if options.preserve_tryjobs:
2426 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002427
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002428 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002429 parent = self._ComputeParent(
2430 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002431 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002432 with gclient_utils.temporary_file() as desc_tempfile:
2433 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2434 ref_to_push = RunGit(
2435 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002436 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002437 if options.no_add_changeid:
2438 pass
2439 else: # adding Change-Ids is okay.
2440 if not git_footers.get_footer_change_id(change_desc.description):
2441 DownloadGerritHook(False)
2442 change_desc.set_description(
2443 self._AddChangeIdToCommitMessage(change_desc.description,
2444 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002445 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002446 # For no-squash mode, we assume the remote called "origin" is the one we
2447 # want. It is not worthwhile to support different workflows for
2448 # no-squash mode.
2449 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002450 # attempt to extract the changeid from the current description
2451 # fail informatively if not possible.
2452 change_id_candidates = git_footers.get_footer_change_id(
2453 change_desc.description)
2454 if not change_id_candidates:
2455 DieWithError("Unable to extract change-id from message.")
2456 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002457
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002458 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002459 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2460 ref_to_push)]).splitlines()
2461 if len(commits) > 1:
2462 print('WARNING: This will upload %d commits. Run the following command '
2463 'to see which commits will be uploaded: ' % len(commits))
2464 print('git log %s..%s' % (parent, ref_to_push))
2465 print('You can also use `git squash-branch` to squash these into a '
2466 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002467 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002468
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002469 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002470 cc = []
2471 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2472 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2473 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002474 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002475 if len(cc) > 100:
2476 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2477 'process/lsc/lsc_workflow.md')
2478 print('WARNING: This will auto-CC %s users.' % len(cc))
2479 print('LSC may be more appropriate: %s' % lsc)
2480 print('You can also use the --no-autocc flag to disable auto-CC.')
2481 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002482 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002483 if options.cc:
2484 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002485 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002486 if change_desc.get_cced():
2487 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002488 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002489 valid_accounts = set(reviewers + cc)
2490 # TODO(crbug/877717): relax this for all hosts.
2491 else:
2492 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002493 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002494 logging.info('accounts %s are recognized, %s invalid',
2495 sorted(valid_accounts),
2496 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002497
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002498 # Extra options that can be specified at push time. Doc:
2499 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002500 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002501
Aaron Gable844cf292017-06-28 11:32:59 -07002502 # By default, new changes are started in WIP mode, and subsequent patchsets
2503 # don't send email. At any time, passing --send-mail will mark the change
2504 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002505 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002506 refspec_opts.append('ready')
2507 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002508 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002509 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002510 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002511 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002512
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002513 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002514 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002515
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002516 # Set options.title in case user was prompted in _GetTitleForUpload and
2517 # _CMDUploadChange needs to be called again.
2518 options.title = self._GetTitleForUpload(options)
2519 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002520 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002521 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002522 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002523
agablec6787972016-09-09 16:13:34 -07002524 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002525 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002526
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002527 for r in sorted(reviewers):
2528 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002529 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002530 reviewers.remove(r)
2531 else:
2532 # TODO(tandrii): this should probably be a hard failure.
2533 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2534 % r)
2535 for c in sorted(cc):
2536 # refspec option will be rejected if cc doesn't correspond to an
2537 # account, even though REST call to add such arbitrary cc may succeed.
2538 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002539 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002540 cc.remove(c)
2541
rmistry9eadede2016-09-19 11:22:43 -07002542 if options.topic:
2543 # Documentation on Gerrit topics is here:
2544 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002545 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002546
Edward Lemur687ca902018-12-05 02:30:30 +00002547 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002548 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002549 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002550 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002551 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002552 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002553 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002554 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002555 elif options.cq_quick_run:
2556 refspec_opts.append('l=Commit-Queue+1')
2557 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002558
2559 if change_desc.get_reviewers(tbr_only=True):
2560 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002561 self.GetGerritHost(),
2562 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002563 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002564
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002565 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002566 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002567 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002568 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002569 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2570
2571 refspec_suffix = ''
2572 if refspec_opts:
2573 refspec_suffix = '%' + ','.join(refspec_opts)
2574 assert ' ' not in refspec_suffix, (
2575 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2576 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002577
Edward Lemur1b52d872019-05-09 21:12:12 +00002578 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002579 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002580 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002581 'change_id': change_id,
2582 'description': change_desc.description,
2583 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002584
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002585 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002586 git_push_metadata,
2587 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002588
2589 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002590 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002591 change_numbers = [m.group(1)
2592 for m in map(regex.match, push_stdout.splitlines())
2593 if m]
2594 if len(change_numbers) != 1:
2595 DieWithError(
2596 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002597 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002598 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002599 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002600
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002601 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002602 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002603 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002604 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002605 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002606 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002607 reviewers, cc,
2608 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002609
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002610 return 0
2611
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002612 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2613 change_desc):
2614 """Computes parent of the generated commit to be uploaded to Gerrit.
2615
2616 Returns revision or a ref name.
2617 """
2618 if custom_cl_base:
2619 # Try to avoid creating additional unintended CLs when uploading, unless
2620 # user wants to take this risk.
2621 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2622 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2623 local_ref_of_target_remote])
2624 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002625 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002626 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2627 'If you proceed with upload, more than 1 CL may be created by '
2628 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2629 'If you are certain that specified base `%s` has already been '
2630 'uploaded to Gerrit as another CL, you may proceed.\n' %
2631 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2632 if not force:
2633 confirm_or_exit(
2634 'Do you take responsibility for cleaning up potential mess '
2635 'resulting from proceeding with upload?',
2636 action='upload')
2637 return custom_cl_base
2638
Aaron Gablef97e33d2017-03-30 15:44:27 -07002639 if remote != '.':
2640 return self.GetCommonAncestorWithUpstream()
2641
2642 # If our upstream branch is local, we base our squashed commit on its
2643 # squashed version.
2644 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2645
Aaron Gablef97e33d2017-03-30 15:44:27 -07002646 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002647 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002648 if upstream_branch_name == 'main':
2649 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002650
2651 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002652 # TODO(tandrii): consider checking parent change in Gerrit and using its
2653 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2654 # the tree hash of the parent branch. The upside is less likely bogus
2655 # requests to reupload parent change just because it's uploadhash is
2656 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002657 parent = scm.GIT.GetBranchConfig(
2658 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002659 # Verify that the upstream branch has been uploaded too, otherwise
2660 # Gerrit will create additional CLs when uploading.
2661 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2662 RunGitSilent(['rev-parse', parent + ':'])):
2663 DieWithError(
2664 '\nUpload upstream branch %s first.\n'
2665 'It is likely that this branch has been rebased since its last '
2666 'upload, so you just need to upload it again.\n'
2667 '(If you uploaded it with --no-squash, then branch dependencies '
2668 'are not supported, and you should reupload with --squash.)'
2669 % upstream_branch_name,
2670 change_desc)
2671 return parent
2672
Edward Lemura12175c2020-03-09 16:58:26 +00002673 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002674 """Re-commits using the current message, assumes the commit hook is in
2675 place.
2676 """
Edward Lemura12175c2020-03-09 16:58:26 +00002677 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002678 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002679 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002680 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002681 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002682
2683 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002684
tandriie113dfd2016-10-11 10:20:12 -07002685 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002686 try:
2687 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002688 except GerritChangeNotExists:
2689 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002690
2691 if data['status'] in ('ABANDONED', 'MERGED'):
2692 return 'CL %s is closed' % self.GetIssue()
2693
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002694 def GetGerritChange(self, patchset=None):
2695 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002696 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002697 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002698 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002699 data = self._GetChangeDetail(['ALL_REVISIONS'])
2700
2701 assert host and issue and patchset, 'CL must be uploaded first'
2702
2703 has_patchset = any(
2704 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002705 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002706 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002707 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002708 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002709
tandrii8c5a3532016-11-04 07:52:02 -07002710 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002711 'host': host,
2712 'change': issue,
2713 'project': data['project'],
2714 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002715 }
tandriie113dfd2016-10-11 10:20:12 -07002716
tandriide281ae2016-10-12 06:02:30 -07002717 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002718 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002719
Edward Lemur707d70b2018-02-07 00:50:14 +01002720 def GetReviewers(self):
2721 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002722 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002723
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002724
Lei Zhang8a0efc12020-08-05 19:58:45 +00002725def _get_bug_line_values(default_project_prefix, bugs):
2726 """Given default_project_prefix and comma separated list of bugs, yields bug
2727 line values.
tandriif9aefb72016-07-01 09:06:51 -07002728
2729 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002730 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002731 * string, which is left as is.
2732
2733 This function may produce more than one line, because bugdroid expects one
2734 project per line.
2735
Lei Zhang8a0efc12020-08-05 19:58:45 +00002736 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002737 ['v8:123', 'chromium:789']
2738 """
2739 default_bugs = []
2740 others = []
2741 for bug in bugs.split(','):
2742 bug = bug.strip()
2743 if bug:
2744 try:
2745 default_bugs.append(int(bug))
2746 except ValueError:
2747 others.append(bug)
2748
2749 if default_bugs:
2750 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002751 if default_project_prefix:
2752 if not default_project_prefix.endswith(':'):
2753 default_project_prefix += ':'
2754 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002755 else:
2756 yield default_bugs
2757 for other in sorted(others):
2758 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2759 yield other
2760
2761
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002762class ChangeDescription(object):
2763 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002764 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002765 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002766 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002767 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002768 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002769 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2770 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002771 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002772 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002773
Dan Beamd8b04ca2019-10-10 21:23:26 +00002774 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002775 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002776 if bug:
2777 regexp = re.compile(self.BUG_LINE)
2778 prefix = settings.GetBugPrefix()
2779 if not any((regexp.match(line) for line in self._description_lines)):
2780 values = list(_get_bug_line_values(prefix, bug))
2781 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002782 if fixed:
2783 regexp = re.compile(self.FIXED_LINE)
2784 prefix = settings.GetBugPrefix()
2785 if not any((regexp.match(line) for line in self._description_lines)):
2786 values = list(_get_bug_line_values(prefix, fixed))
2787 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002788
agable@chromium.org42c20792013-09-12 17:34:49 +00002789 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002790 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002791 return '\n'.join(self._description_lines)
2792
2793 def set_description(self, desc):
2794 if isinstance(desc, basestring):
2795 lines = desc.splitlines()
2796 else:
2797 lines = [line.rstrip() for line in desc]
2798 while lines and not lines[0]:
2799 lines.pop(0)
2800 while lines and not lines[-1]:
2801 lines.pop(-1)
2802 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002803
Edward Lemur5a644f82020-03-18 16:44:57 +00002804 def ensure_change_id(self, change_id):
2805 description = self.description
2806 footer_change_ids = git_footers.get_footer_change_id(description)
2807 # Make sure that the Change-Id in the description matches the given one.
2808 if footer_change_ids != [change_id]:
2809 if footer_change_ids:
2810 # Remove any existing Change-Id footers since they don't match the
2811 # expected change_id footer.
2812 description = git_footers.remove_footer(description, 'Change-Id')
2813 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2814 'if you want to set a new one.')
2815 # Add the expected Change-Id footer.
2816 description = git_footers.add_footer_change_id(description, change_id)
2817 self.set_description(description)
2818
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002819 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002820 """Rewrites the R=/TBR= line(s) as a single line each.
2821
2822 Args:
2823 reviewers (list(str)) - list of additional emails to use for reviewers.
2824 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002825 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002826 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002827 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002828
2829 reviewers = set(reviewers)
2830 tbrs = set(tbrs)
2831 LOOKUP = {
2832 'TBR': tbrs,
2833 'R': reviewers,
2834 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002835
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002836 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002837 regexp = re.compile(self.R_LINE)
2838 matches = [regexp.match(line) for line in self._description_lines]
2839 new_desc = [l for i, l in enumerate(self._description_lines)
2840 if not matches[i]]
2841 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002842
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002844
2845 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 for match in matches:
2847 if not match:
2848 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002849 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2850
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002851 # If any folks ended up in both groups, remove them from tbrs.
2852 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002853
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002854 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2855 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002856
2857 # Put the new lines in the description where the old first R= line was.
2858 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2859 if 0 <= line_loc < len(self._description_lines):
2860 if new_tbr_line:
2861 self._description_lines.insert(line_loc, new_tbr_line)
2862 if new_r_line:
2863 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002864 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002865 if new_r_line:
2866 self.append_footer(new_r_line)
2867 if new_tbr_line:
2868 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002869
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002870 def set_preserve_tryjobs(self):
2871 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2872 footers = git_footers.parse_footers(self.description)
2873 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2874 if v.lower() == 'true':
2875 return
2876 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2877
Anthony Polito8b955342019-09-24 19:01:36 +00002878 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002879 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002880 self.set_description([
2881 '# Enter a description of the change.',
2882 '# This will be displayed on the codereview site.',
2883 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002884 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002885 '--------------------',
2886 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002887 bug_regexp = re.compile(self.BUG_LINE)
2888 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002889 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002890 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002891
Dan Beamd8b04ca2019-10-10 21:23:26 +00002892 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002893 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002894
Bruce Dawsonfc487042020-10-27 19:11:37 +00002895 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002896 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002897 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002898 if not content:
2899 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002900 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002901
Bruce Dawson2377b012018-01-11 16:46:49 -08002902 # Strip off comments and default inserted "Bug:" line.
2903 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002904 (line.startswith('#') or
2905 line.rstrip() == "Bug:" or
2906 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002907 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002908 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002909 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002910
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002911 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002912 """Adds a footer line to the description.
2913
2914 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2915 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2916 that Gerrit footers are always at the end.
2917 """
2918 parsed_footer_line = git_footers.parse_footer(line)
2919 if parsed_footer_line:
2920 # Line is a gerrit footer in the form: Footer-Key: any value.
2921 # Thus, must be appended observing Gerrit footer rules.
2922 self.set_description(
2923 git_footers.add_footer(self.description,
2924 key=parsed_footer_line[0],
2925 value=parsed_footer_line[1]))
2926 return
2927
2928 if not self._description_lines:
2929 self._description_lines.append(line)
2930 return
2931
2932 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2933 if gerrit_footers:
2934 # git_footers.split_footers ensures that there is an empty line before
2935 # actual (gerrit) footers, if any. We have to keep it that way.
2936 assert top_lines and top_lines[-1] == ''
2937 top_lines, separator = top_lines[:-1], top_lines[-1:]
2938 else:
2939 separator = [] # No need for separator if there are no gerrit_footers.
2940
2941 prev_line = top_lines[-1] if top_lines else ''
2942 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2943 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2944 top_lines.append('')
2945 top_lines.append(line)
2946 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002947
tandrii99a72f22016-08-17 14:33:24 -07002948 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002949 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002950 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002951 reviewers = [match.group(2).strip()
2952 for match in matches
2953 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002954 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002955
bradnelsond975b302016-10-23 12:20:23 -07002956 def get_cced(self):
2957 """Retrieves the list of reviewers."""
2958 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2959 cced = [match.group(2).strip() for match in matches if match]
2960 return cleanup_list(cced)
2961
Nodir Turakulov23b82142017-11-16 11:04:25 -08002962 def get_hash_tags(self):
2963 """Extracts and sanitizes a list of Gerrit hashtags."""
2964 subject = (self._description_lines or ('',))[0]
2965 subject = re.sub(
2966 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2967
2968 tags = []
2969 start = 0
2970 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2971 while True:
2972 m = bracket_exp.match(subject, start)
2973 if not m:
2974 break
2975 tags.append(self.sanitize_hash_tag(m.group(1)))
2976 start = m.end()
2977
2978 if not tags:
2979 # Try "Tag: " prefix.
2980 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2981 if m:
2982 tags.append(self.sanitize_hash_tag(m.group(1)))
2983 return tags
2984
2985 @classmethod
2986 def sanitize_hash_tag(cls, tag):
2987 """Returns a sanitized Gerrit hash tag.
2988
2989 A sanitized hashtag can be used as a git push refspec parameter value.
2990 """
2991 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2992
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002993
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002994def FindCodereviewSettingsFile(filename='codereview.settings'):
2995 """Finds the given file starting in the cwd and going up.
2996
2997 Only looks up to the top of the repository unless an
2998 'inherit-review-settings-ok' file exists in the root of the repository.
2999 """
3000 inherit_ok_file = 'inherit-review-settings-ok'
3001 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003002 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003003 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3004 root = '/'
3005 while True:
3006 if filename in os.listdir(cwd):
3007 if os.path.isfile(os.path.join(cwd, filename)):
3008 return open(os.path.join(cwd, filename))
3009 if cwd == root:
3010 break
3011 cwd = os.path.dirname(cwd)
3012
3013
3014def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003015 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003016 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003018 def SetProperty(name, setting, unset_error_ok=False):
3019 fullname = 'rietveld.' + name
3020 if setting in keyvals:
3021 RunGit(['config', fullname, keyvals[setting]])
3022 else:
3023 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3024
tandrii48df5812016-10-17 03:55:37 -07003025 if not keyvals.get('GERRIT_HOST', False):
3026 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003027 # Only server setting is required. Other settings can be absent.
3028 # In that case, we ignore errors raised during option deletion attempt.
3029 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3030 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3031 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003032 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003033 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3034 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003035 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3036 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003037 SetProperty(
3038 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003039 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003040
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003041 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003042 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003043
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003044 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003045 RunGit(['config', 'gerrit.squash-uploads',
3046 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003047
tandrii@chromium.org28253532016-04-14 13:46:56 +00003048 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003049 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003050 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3051
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003052 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003053 # should be of the form
3054 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3055 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003056 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3057 keyvals['ORIGIN_URL_CONFIG']])
3058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003059
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003060def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003061 """Downloads a network object to a local file, like urllib.urlretrieve.
3062
3063 This is necessary because urllib is broken for SSL connections via a proxy.
3064 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003065 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003066 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003067
3068
ukai@chromium.org712d6102013-11-27 00:52:58 +00003069def hasSheBang(fname):
3070 """Checks fname is a #! script."""
3071 with open(fname) as f:
3072 return f.read(2).startswith('#!')
3073
3074
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003075def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003076 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003077
3078 Args:
3079 force: True to update hooks. False to install hooks if not present.
3080 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003081 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003082 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3083 if not os.access(dst, os.X_OK):
3084 if os.path.exists(dst):
3085 if not force:
3086 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003087 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003088 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003089 if not hasSheBang(dst):
3090 DieWithError('Not a script: %s\n'
3091 'You need to download from\n%s\n'
3092 'into .git/hooks/commit-msg and '
3093 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003094 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3095 except Exception:
3096 if os.path.exists(dst):
3097 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003098 DieWithError('\nFailed to download hooks.\n'
3099 'You need to download from\n%s\n'
3100 'into .git/hooks/commit-msg and '
3101 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003102
3103
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003104class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003105 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003106
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003107 _GOOGLESOURCE = 'googlesource.com'
3108
3109 def __init__(self):
3110 # Cached list of [host, identity, source], where source is either
3111 # .gitcookies or .netrc.
3112 self._all_hosts = None
3113
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003114 def ensure_configured_gitcookies(self):
3115 """Runs checks and suggests fixes to make git use .gitcookies from default
3116 path."""
3117 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3118 configured_path = RunGitSilent(
3119 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003120 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003121 if configured_path:
3122 self._ensure_default_gitcookies_path(configured_path, default)
3123 else:
3124 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003125
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003126 @staticmethod
3127 def _ensure_default_gitcookies_path(configured_path, default_path):
3128 assert configured_path
3129 if configured_path == default_path:
3130 print('git is already configured to use your .gitcookies from %s' %
3131 configured_path)
3132 return
3133
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003134 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003135 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3136 (configured_path, default_path))
3137
3138 if not os.path.exists(configured_path):
3139 print('However, your configured .gitcookies file is missing.')
3140 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3141 action='reconfigure')
3142 RunGit(['config', '--global', 'http.cookiefile', default_path])
3143 return
3144
3145 if os.path.exists(default_path):
3146 print('WARNING: default .gitcookies file already exists %s' %
3147 default_path)
3148 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3149 default_path)
3150
3151 confirm_or_exit('Move existing .gitcookies to default location?',
3152 action='move')
3153 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003154 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003155 print('Moved and reconfigured git to use .gitcookies from %s' %
3156 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003157
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003158 @staticmethod
3159 def _configure_gitcookies_path(default_path):
3160 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3161 if os.path.exists(netrc_path):
3162 print('You seem to be using outdated .netrc for git credentials: %s' %
3163 netrc_path)
3164 print('This tool will guide you through setting up recommended '
3165 '.gitcookies store for git credentials.\n'
3166 '\n'
3167 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3168 ' git config --global --unset http.cookiefile\n'
3169 ' mv %s %s.backup\n\n' % (default_path, default_path))
3170 confirm_or_exit(action='setup .gitcookies')
3171 RunGit(['config', '--global', 'http.cookiefile', default_path])
3172 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003173
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003174 def get_hosts_with_creds(self, include_netrc=False):
3175 if self._all_hosts is None:
3176 a = gerrit_util.CookiesAuthenticator()
3177 self._all_hosts = [
3178 (h, u, s)
3179 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003180 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3181 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003182 )
3183 if h.endswith(self._GOOGLESOURCE)
3184 ]
3185
3186 if include_netrc:
3187 return self._all_hosts
3188 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3189
3190 def print_current_creds(self, include_netrc=False):
3191 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3192 if not hosts:
3193 print('No Git/Gerrit credentials found')
3194 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003195 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003196 header = [('Host', 'User', 'Which file'),
3197 ['=' * l for l in lengths]]
3198 for row in (header + hosts):
3199 print('\t'.join((('%%+%ds' % l) % s)
3200 for l, s in zip(lengths, row)))
3201
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003202 @staticmethod
3203 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003204 """Parses identity "git-<username>.domain" into <username> and domain."""
3205 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003206 # distinguishable from sub-domains. But we do know typical domains:
3207 if identity.endswith('.chromium.org'):
3208 domain = 'chromium.org'
3209 username = identity[:-len('.chromium.org')]
3210 else:
3211 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003212 if username.startswith('git-'):
3213 username = username[len('git-'):]
3214 return username, domain
3215
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003216 def _canonical_git_googlesource_host(self, host):
3217 """Normalizes Gerrit hosts (with '-review') to Git host."""
3218 assert host.endswith(self._GOOGLESOURCE)
3219 # Prefix doesn't include '.' at the end.
3220 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3221 if prefix.endswith('-review'):
3222 prefix = prefix[:-len('-review')]
3223 return prefix + '.' + self._GOOGLESOURCE
3224
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003225 def _canonical_gerrit_googlesource_host(self, host):
3226 git_host = self._canonical_git_googlesource_host(host)
3227 prefix = git_host.split('.', 1)[0]
3228 return prefix + '-review.' + self._GOOGLESOURCE
3229
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003230 def _get_counterpart_host(self, host):
3231 assert host.endswith(self._GOOGLESOURCE)
3232 git = self._canonical_git_googlesource_host(host)
3233 gerrit = self._canonical_gerrit_googlesource_host(git)
3234 return git if gerrit == host else gerrit
3235
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003236 def has_generic_host(self):
3237 """Returns whether generic .googlesource.com has been configured.
3238
3239 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3240 """
3241 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3242 if host == '.' + self._GOOGLESOURCE:
3243 return True
3244 return False
3245
3246 def _get_git_gerrit_identity_pairs(self):
3247 """Returns map from canonic host to pair of identities (Git, Gerrit).
3248
3249 One of identities might be None, meaning not configured.
3250 """
3251 host_to_identity_pairs = {}
3252 for host, identity, _ in self.get_hosts_with_creds():
3253 canonical = self._canonical_git_googlesource_host(host)
3254 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3255 idx = 0 if canonical == host else 1
3256 pair[idx] = identity
3257 return host_to_identity_pairs
3258
3259 def get_partially_configured_hosts(self):
3260 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003261 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003262 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003263 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003264
3265 def get_conflicting_hosts(self):
3266 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003267 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003268 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003269 if None not in (i1, i2) and i1 != i2)
3270
3271 def get_duplicated_hosts(self):
3272 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003273 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003274
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003275
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003276 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003277 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003278 hosts = sorted(hosts)
3279 assert hosts
3280 if extra_column_func is None:
3281 extras = [''] * len(hosts)
3282 else:
3283 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003284 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3285 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003286 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003287 lines.append(tmpl % he)
3288 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003290 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003292 yield ('.googlesource.com wildcard record detected',
3293 ['Chrome Infrastructure team recommends to list full host names '
3294 'explicitly.'],
3295 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003296
3297 dups = self.get_duplicated_hosts()
3298 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003299 yield ('The following hosts were defined twice',
3300 self._format_hosts(dups),
3301 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302
3303 partial = self.get_partially_configured_hosts()
3304 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003305 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3306 'These hosts are missing',
3307 self._format_hosts(partial, lambda host: 'but %s defined' %
3308 self._get_counterpart_host(host)),
3309 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003310
3311 conflicting = self.get_conflicting_hosts()
3312 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003313 yield ('The following Git hosts have differing credentials from their '
3314 'Gerrit counterparts',
3315 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3316 tuple(self._get_git_gerrit_identity_pairs()[host])),
3317 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003318
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003319 def find_and_report_problems(self):
3320 """Returns True if there was at least one problem, else False."""
3321 found = False
3322 bad_hosts = set()
3323 for title, sublines, hosts in self._find_problems():
3324 if not found:
3325 found = True
3326 print('\n\n.gitcookies problem report:\n')
3327 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003328 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 if sublines:
3330 print()
3331 print(' %s' % '\n '.join(sublines))
3332 print()
3333
3334 if bad_hosts:
3335 assert found
3336 print(' You can manually remove corresponding lines in your %s file and '
3337 'visit the following URLs with correct account to generate '
3338 'correct credential lines:\n' %
3339 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3340 print(' %s' % '\n '.join(sorted(set(
3341 gerrit_util.CookiesAuthenticator().get_new_password_url(
3342 self._canonical_git_googlesource_host(host))
3343 for host in bad_hosts
3344 ))))
3345 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003346
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003347
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003348@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003349def CMDcreds_check(parser, args):
3350 """Checks credentials and suggests changes."""
3351 _, _ = parser.parse_args(args)
3352
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003353 # Code below checks .gitcookies. Abort if using something else.
3354 authn = gerrit_util.Authenticator.get()
3355 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003356 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003357 'This command is not designed for bot environment. It checks '
3358 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003359 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3360 if isinstance(authn, gerrit_util.GceAuthenticator):
3361 message += (
3362 '\n'
3363 'If you need to run this on GCE or a cloudtop instance, '
3364 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3365 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003366
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003367 checker = _GitCookiesChecker()
3368 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003369
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003370 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003371 checker.print_current_creds(include_netrc=True)
3372
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003373 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003374 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003375 return 0
3376 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003377
3378
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003379@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003380def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003381 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003382 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003383 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003384 _, args = parser.parse_args(args)
3385 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003386 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003387 return RunGit(['config', 'branch.%s.base-url' % branch],
3388 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003389
3390 print('Setting base-url to %s' % args[0])
3391 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3392 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003393
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003394
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003395def color_for_status(status):
3396 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003397 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003398 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003399 'unsent': BOLD + Fore.YELLOW,
3400 'waiting': BOLD + Fore.RED,
3401 'reply': BOLD + Fore.YELLOW,
3402 'not lgtm': BOLD + Fore.RED,
3403 'lgtm': BOLD + Fore.GREEN,
3404 'commit': BOLD + Fore.MAGENTA,
3405 'closed': BOLD + Fore.CYAN,
3406 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003407 }.get(status, Fore.WHITE)
3408
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003409
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003410def get_cl_statuses(changes, fine_grained, max_processes=None):
3411 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003412
3413 If fine_grained is true, this will fetch CL statuses from the server.
3414 Otherwise, simply indicate if there's a matching url for the given branches.
3415
3416 If max_processes is specified, it is used as the maximum number of processes
3417 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3418 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003419
3420 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003421 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003422 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003423 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003424
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003425 if not fine_grained:
3426 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003427 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003428 for cl in changes:
3429 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003430 return
3431
3432 # First, sort out authentication issues.
3433 logging.debug('ensuring credentials exist')
3434 for cl in changes:
3435 cl.EnsureAuthenticated(force=False, refresh=True)
3436
3437 def fetch(cl):
3438 try:
3439 return (cl, cl.GetStatus())
3440 except:
3441 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003442 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003443 raise
3444
3445 threads_count = len(changes)
3446 if max_processes:
3447 threads_count = max(1, min(threads_count, max_processes))
3448 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3449
Edward Lemur61bf4172020-02-24 23:22:37 +00003450 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003451 fetched_cls = set()
3452 try:
3453 it = pool.imap_unordered(fetch, changes).__iter__()
3454 while True:
3455 try:
3456 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003457 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003458 break
3459 fetched_cls.add(cl)
3460 yield cl, status
3461 finally:
3462 pool.close()
3463
3464 # Add any branches that failed to fetch.
3465 for cl in set(changes) - fetched_cls:
3466 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003467
rmistry@google.com2dd99862015-06-22 12:22:18 +00003468
Jose Lopes3863fc52020-04-07 17:00:25 +00003469def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003470 """Uploads CLs of local branches that are dependents of the current branch.
3471
3472 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003473
3474 test1 -> test2.1 -> test3.1
3475 -> test3.2
3476 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003477
3478 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3479 run on the dependent branches in this order:
3480 test2.1, test3.1, test3.2, test2.2, test3.3
3481
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003482 Note: This function does not rebase your local dependent branches. Use it
3483 when you make a change to the parent branch that will not conflict
3484 with its dependent branches, and you would like their dependencies
3485 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003486 """
3487 if git_common.is_dirty_git_tree('upload-branch-deps'):
3488 return 1
3489
3490 root_branch = cl.GetBranch()
3491 if root_branch is None:
3492 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3493 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003494 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3496 'patchset dependencies without an uploaded CL.')
3497
3498 branches = RunGit(['for-each-ref',
3499 '--format=%(refname:short) %(upstream:short)',
3500 'refs/heads'])
3501 if not branches:
3502 print('No local branches found.')
3503 return 0
3504
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003505 # Create a dictionary of all local branches to the branches that are
3506 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003507 tracked_to_dependents = collections.defaultdict(list)
3508 for b in branches.splitlines():
3509 tokens = b.split()
3510 if len(tokens) == 2:
3511 branch_name, tracked = tokens
3512 tracked_to_dependents[tracked].append(branch_name)
3513
vapiera7fbd5a2016-06-16 09:17:49 -07003514 print()
3515 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003516 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003517
rmistry@google.com2dd99862015-06-22 12:22:18 +00003518 def traverse_dependents_preorder(branch, padding=''):
3519 dependents_to_process = tracked_to_dependents.get(branch, [])
3520 padding += ' '
3521 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003522 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003523 dependents.append(dependent)
3524 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003525
rmistry@google.com2dd99862015-06-22 12:22:18 +00003526 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528
3529 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003530 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003531 return 0
3532
Jose Lopes3863fc52020-04-07 17:00:25 +00003533 if not force:
3534 confirm_or_exit('This command will checkout all dependent branches and run '
3535 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003536
rmistry@google.com2dd99862015-06-22 12:22:18 +00003537 # Record all dependents that failed to upload.
3538 failures = {}
3539 # Go through all dependents, checkout the branch and upload.
3540 try:
3541 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003542 print()
3543 print('--------------------------------------')
3544 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003545 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003546 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003547 try:
3548 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003549 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003550 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003551 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003552 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003553 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003554 finally:
3555 # Swap back to the original root branch.
3556 RunGit(['checkout', '-q', root_branch])
3557
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print()
3559 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 for dependent_branch in dependents:
3561 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print(' %s : %s' % (dependent_branch, upload_status))
3563 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564
3565 return 0
3566
3567
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003568def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003569 """Given a proposed tag name, returns a tag name that is guaranteed to be
3570 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3571 or 'foo-3', and so on."""
3572
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003573 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003574 for suffix_num in itertools.count(1):
3575 if suffix_num == 1:
3576 to_check = proposed_tag
3577 else:
3578 to_check = '%s-%d' % (proposed_tag, suffix_num)
3579
3580 if to_check not in existing_tags:
3581 return to_check
3582
3583
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003584@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003585def CMDarchive(parser, args):
3586 """Archives and deletes branches associated with closed changelists."""
3587 parser.add_option(
3588 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003589 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003590 parser.add_option(
3591 '-f', '--force', action='store_true',
3592 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003593 parser.add_option(
3594 '-d', '--dry-run', action='store_true',
3595 help='Skip the branch tagging and removal steps.')
3596 parser.add_option(
3597 '-t', '--notags', action='store_true',
3598 help='Do not tag archived branches. '
3599 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003600 parser.add_option(
3601 '-p',
3602 '--pattern',
3603 default='git-cl-archived-{issue}-{branch}',
3604 help='Format string for archive tags. '
3605 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003606
kmarshall3bff56b2016-06-06 18:31:47 -07003607 options, args = parser.parse_args(args)
3608 if args:
3609 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003610
3611 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3612 if not branches:
3613 return 0
3614
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003615 tags = RunGit(['for-each-ref', '--format=%(refname)',
3616 'refs/tags']).splitlines() or []
3617 tags = [t.split('/')[-1] for t in tags]
3618
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003620 changes = [Changelist(branchref=b)
3621 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003622 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3623 statuses = get_cl_statuses(changes,
3624 fine_grained=True,
3625 max_processes=options.maxjobs)
3626 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003627 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3628 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003629 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003630 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003631 proposal.sort()
3632
3633 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003634 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003635 return 0
3636
Edward Lemur85153282020-02-14 22:06:29 +00003637 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003638
vapiera7fbd5a2016-06-16 09:17:49 -07003639 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003640 if options.notags:
3641 for next_item in proposal:
3642 print(' ' + next_item[0])
3643 else:
3644 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3645 for next_item in proposal:
3646 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003647
kmarshall9249e012016-08-23 12:02:16 -07003648 # Quit now on precondition failure or if instructed by the user, either
3649 # via an interactive prompt or by command line flags.
3650 if options.dry_run:
3651 print('\nNo changes were made (dry run).\n')
3652 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003653
3654 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003655 print('You are currently on a branch \'%s\' which is associated with a '
3656 'closed codereview issue, so archive cannot proceed. Please '
3657 'checkout another branch and run this command again.' %
3658 current_branch)
3659 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003660
3661 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003662 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003663 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003664 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003665 return 1
3666
3667 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003668 if not options.notags:
3669 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003670
3671 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3672 # Clean up the tag if we failed to delete the branch.
3673 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003674
vapiera7fbd5a2016-06-16 09:17:49 -07003675 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003676
3677 return 0
3678
3679
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003680@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003681def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003682 """Show status of changelists.
3683
3684 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003685 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003686 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003687 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003688 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003689 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003690 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003691 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003692
3693 Also see 'git cl comments'.
3694 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003695 parser.add_option(
3696 '--no-branch-color',
3697 action='store_true',
3698 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003699 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003700 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003701 parser.add_option('-f', '--fast', action='store_true',
3702 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003703 parser.add_option(
3704 '-j', '--maxjobs', action='store', type=int,
3705 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003706 parser.add_option(
3707 '-i', '--issue', type=int,
3708 help='Operate on this issue instead of the current branch\'s implicit '
3709 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003710 parser.add_option('-d',
3711 '--date-order',
3712 action='store_true',
3713 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003714 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003715 if args:
3716 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717
iannuccie53c9352016-08-17 14:40:40 -07003718 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003719 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003720
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003721 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003722 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003723 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003724 if cl.GetIssue():
3725 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003726 elif options.field == 'id':
3727 issueid = cl.GetIssue()
3728 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003729 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003730 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003731 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003732 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003733 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003734 elif options.field == 'status':
3735 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003736 elif options.field == 'url':
3737 url = cl.GetIssueURL()
3738 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003740 return 0
3741
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003742 branches = RunGit([
3743 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3744 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003745 if not branches:
3746 print('No local branch found.')
3747 return 0
3748
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003749 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003750 Changelist(branchref=b, commit_date=ct)
3751 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3752 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003754 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003755 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003756 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003757
Edward Lemur85153282020-02-14 22:06:29 +00003758 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003759
3760 def FormatBranchName(branch, colorize=False):
3761 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3762 an asterisk when it is the current branch."""
3763
3764 asterisk = ""
3765 color = Fore.RESET
3766 if branch == current_branch:
3767 asterisk = "* "
3768 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003769 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003770
3771 if colorize:
3772 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003773 return asterisk + branch_name
3774
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003775 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003776
3777 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003778
3779 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003780 sorted_changes = sorted(changes,
3781 key=lambda c: c.GetCommitDate(),
3782 reverse=True)
3783 else:
3784 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3785 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003787 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003788 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003789 branch_statuses[c.GetBranch()] = status
3790 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003791 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003792 if url and (not status or status == 'error'):
3793 # The issue probably doesn't exist anymore.
3794 url += ' (broken)'
3795
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003796 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003797 # Turn off bold as well as colors.
3798 END = '\033[0m'
3799 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003800 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003801 color = ''
3802 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003803 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003804
Alan Cuttera3be9a52019-03-04 18:50:33 +00003805 branch_display = FormatBranchName(branch)
3806 padding = ' ' * (alignment - len(branch_display))
3807 if not options.no_branch_color:
3808 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003809
Alan Cuttera3be9a52019-03-04 18:50:33 +00003810 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3811 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003812
vapiera7fbd5a2016-06-16 09:17:49 -07003813 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003814 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003815 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003816 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003817 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003818 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003819 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003820 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003821 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003822 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003823 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003824 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003825 return 0
3826
3827
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003828def colorize_CMDstatus_doc():
3829 """To be called once in main() to add colors to git cl status help."""
3830 colors = [i for i in dir(Fore) if i[0].isupper()]
3831
3832 def colorize_line(line):
3833 for color in colors:
3834 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003835 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003836 indent = len(line) - len(line.lstrip(' ')) + 1
3837 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3838 return line
3839
3840 lines = CMDstatus.__doc__.splitlines()
3841 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3842
3843
phajdan.jre328cf92016-08-22 04:12:17 -07003844def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003845 if path == '-':
3846 json.dump(contents, sys.stdout)
3847 else:
3848 with open(path, 'w') as f:
3849 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003850
3851
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003852@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003853@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003854def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003855 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856
3857 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003858 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003859 parser.add_option('-r', '--reverse', action='store_true',
3860 help='Lookup the branch(es) for the specified issues. If '
3861 'no issues are specified, all branches with mapped '
3862 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003863 parser.add_option('--json',
3864 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003865 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866
dnj@chromium.org406c4402015-03-03 17:22:28 +00003867 if options.reverse:
3868 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003869 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003870 # Reverse issue lookup.
3871 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003872
3873 git_config = {}
3874 for config in RunGit(['config', '--get-regexp',
3875 r'branch\..*issue']).splitlines():
3876 name, _space, val = config.partition(' ')
3877 git_config[name] = val
3878
dnj@chromium.org406c4402015-03-03 17:22:28 +00003879 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003880 issue = git_config.get(
3881 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003882 if issue:
3883 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003884 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003885 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003886 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003887 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003888 try:
3889 issue_num = int(issue)
3890 except ValueError:
3891 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003892 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003893 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003895 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003896 if options.json:
3897 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003898 return 0
3899
3900 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003901 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003902 if not issue.valid:
3903 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3904 'or no argument to list it.\n'
3905 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003906 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003907 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003908 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003909 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003910 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3911 if options.json:
3912 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003913 'gerrit_host': cl.GetGerritHost(),
3914 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003915 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003916 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003917 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003918 return 0
3919
3920
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003921@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003922def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003923 """Shows or posts review comments for any changelist."""
3924 parser.add_option('-a', '--add-comment', dest='comment',
3925 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003926 parser.add_option('-p', '--publish', action='store_true',
3927 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003928 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003929 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003930 parser.add_option('-m', '--machine-readable', dest='readable',
3931 action='store_false', default=True,
3932 help='output comments in a format compatible with '
3933 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003934 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003935 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003936 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003937
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003938 issue = None
3939 if options.issue:
3940 try:
3941 issue = int(options.issue)
3942 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003943 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003944
Edward Lemur934836a2019-09-09 20:16:54 +00003945 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003946
3947 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003948 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 return 0
3950
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003951 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3952 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003953 for comment in summary:
3954 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003955 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003956 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003957 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003958 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003959 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003960 elif comment.autogenerated:
3961 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003962 else:
3963 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003964 print('\n%s%s %s%s\n%s' % (
3965 color,
3966 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3967 comment.sender,
3968 Fore.RESET,
3969 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3970
smut@google.comc85ac942015-09-15 16:34:43 +00003971 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003972 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003973 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003974 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3975 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003976 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003977 return 0
3978
3979
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003980@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003981@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003982def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003983 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003984 parser.add_option('-d', '--display', action='store_true',
3985 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003986 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003987 help='New description to set for this issue (- for stdin, '
3988 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003989 parser.add_option('-f', '--force', action='store_true',
3990 help='Delete any unpublished Gerrit edits for this issue '
3991 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003992
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003993 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003994
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003995 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003996 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003997 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003998 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003999 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004000
Edward Lemur934836a2019-09-09 20:16:54 +00004001 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004002 if target_issue_arg:
4003 kwargs['issue'] = target_issue_arg.issue
4004 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004005
4006 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004007 if not cl.GetIssue():
4008 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004009
Edward Lemur678a6842019-10-03 22:25:05 +00004010 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004011 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004012
Edward Lemur6c6827c2020-02-06 21:15:18 +00004013 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004014
smut@google.com34fb6b12015-07-13 20:03:26 +00004015 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004016 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004017 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004018
4019 if options.new_description:
4020 text = options.new_description
4021 if text == '-':
4022 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004023 elif text == '+':
4024 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004025 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004026
4027 description.set_description(text)
4028 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004029 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004030 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004031 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004032 return 0
4033
4034
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004035@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004036def CMDlint(parser, args):
4037 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004038 parser.add_option('--filter', action='append', metavar='-x,+y',
4039 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004040 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004041
4042 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004043 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004044 try:
4045 import cpplint
4046 import cpplint_chromium
4047 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004048 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004049 return 1
4050
4051 # Change the current working directory before calling lint so that it
4052 # shows the correct base.
4053 previous_cwd = os.getcwd()
4054 os.chdir(settings.GetRoot())
4055 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004056 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004057 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004058 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004059 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004060 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004061
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004062 # Process cpplint arguments, if any.
4063 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4064 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004065 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004066
Lei Zhang379d1ad2020-07-15 19:40:06 +00004067 include_regex = re.compile(settings.GetLintRegex())
4068 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004069 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4070 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004071 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004072 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004073 continue
4074
4075 if ignore_regex.match(filename):
4076 print('Ignoring file %s' % filename)
4077 continue
4078
4079 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4080 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004081 finally:
4082 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004084 if cpplint._cpplint_state.error_count != 0:
4085 return 1
4086 return 0
4087
4088
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004089@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004091 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004092 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004093 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004094 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004095 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004096 parser.add_option('--all', action='store_true',
4097 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004098 parser.add_option('--files',
4099 nargs=1,
4100 help='Semicolon-separated list of files to be marked as '
4101 'modified when executing presubmit or post-upload hooks. '
4102 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004103 parser.add_option('--parallel', action='store_true',
4104 help='Run all tests specified by input_api.RunTests in all '
4105 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004106 parser.add_option('--resultdb', action='store_true',
4107 help='Run presubmit checks in the ResultSink environment '
4108 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004109 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004110 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004111
sbc@chromium.org71437c02015-04-09 19:29:40 +00004112 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004113 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004114 return 1
4115
Edward Lemur934836a2019-09-09 20:16:54 +00004116 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004117 if args:
4118 base_branch = args[0]
4119 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004120 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004121 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004122
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004123 if cl.GetIssue():
4124 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004125 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004126 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004127
Bruce Dawson13acea32022-05-03 22:13:08 +00004128 if not base_branch:
4129 if not options.force:
4130 print('use --force to check even when not on a branch.')
4131 return 1
4132 base_branch = 'HEAD'
4133
Josip Sokcevic017544d2022-03-31 23:47:53 +00004134 cl.RunHook(committing=not options.upload,
4135 may_prompt=False,
4136 verbose=options.verbose,
4137 parallel=options.parallel,
4138 upstream=base_branch,
4139 description=description,
4140 all_files=options.all,
4141 files=options.files,
4142 resultdb=options.resultdb,
4143 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004144 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004145
4146
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004147def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004148 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004149
4150 Works the same way as
4151 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4152 but can be called on demand on all platforms.
4153
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004154 The basic idea is to generate git hash of a state of the tree, original
4155 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004156 """
4157 lines = []
4158 tree_hash = RunGitSilent(['write-tree'])
4159 lines.append('tree %s' % tree_hash.strip())
4160 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4161 if code == 0:
4162 lines.append('parent %s' % parent.strip())
4163 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4164 lines.append('author %s' % author.strip())
4165 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4166 lines.append('committer %s' % committer.strip())
4167 lines.append('')
4168 # Note: Gerrit's commit-hook actually cleans message of some lines and
4169 # whitespace. This code is not doing this, but it clearly won't decrease
4170 # entropy.
4171 lines.append(message)
4172 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004173 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004174 return 'I%s' % change_hash.strip()
4175
4176
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004177def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004178 """Computes the remote branch ref to use for the CL.
4179
4180 Args:
4181 remote (str): The git remote for the CL.
4182 remote_branch (str): The git remote branch for the CL.
4183 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004184 """
4185 if not (remote and remote_branch):
4186 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004187
wittman@chromium.org455dc922015-01-26 20:15:50 +00004188 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004189 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004190 # refs, which are then translated into the remote full symbolic refs
4191 # below.
4192 if '/' not in target_branch:
4193 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4194 else:
4195 prefix_replacements = (
4196 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4197 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4198 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4199 )
4200 match = None
4201 for regex, replacement in prefix_replacements:
4202 match = re.search(regex, target_branch)
4203 if match:
4204 remote_branch = target_branch.replace(match.group(0), replacement)
4205 break
4206 if not match:
4207 # This is a branch path but not one we recognize; use as-is.
4208 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004209 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004210 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004211 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004212 # Handle the refs that need to land in different refs.
4213 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004214
wittman@chromium.org455dc922015-01-26 20:15:50 +00004215 # Create the true path to the remote branch.
4216 # Does the following translation:
4217 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004218 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004219 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4220 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4221 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4222 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4223 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4224 'refs/heads/')
4225 elif remote_branch.startswith('refs/remotes/branch-heads'):
4226 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004227
wittman@chromium.org455dc922015-01-26 20:15:50 +00004228 return remote_branch
4229
4230
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004231def cleanup_list(l):
4232 """Fixes a list so that comma separated items are put as individual items.
4233
4234 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4235 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4236 """
4237 items = sum((i.split(',') for i in l), [])
4238 stripped_items = (i.strip() for i in items)
4239 return sorted(filter(None, stripped_items))
4240
4241
Aaron Gable4db38df2017-11-03 14:59:07 -07004242@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004243@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004244def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004245 """Uploads the current changelist to codereview.
4246
4247 Can skip dependency patchset uploads for a branch by running:
4248 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004249 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004250 git config --unset branch.branch_name.skip-deps-uploads
4251 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004252
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004253 If the name of the checked out branch starts with "bug-" or "fix-" followed
4254 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004255 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004256
4257 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004258 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004259 [git-cl] add support for hashtags
4260 Foo bar: implement foo
4261 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004262 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004263 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4264 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004265 parser.add_option('--bypass-watchlists', action='store_true',
4266 dest='bypass_watchlists',
4267 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004268 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004269 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004270 parser.add_option('--message', '-m', dest='message',
4271 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004272 parser.add_option('-b', '--bug',
4273 help='pre-populate the bug number(s) for this issue. '
4274 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004275 parser.add_option('--message-file', dest='message_file',
4276 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004277 parser.add_option('--title', '-t', dest='title',
4278 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004279 parser.add_option('-T', '--skip-title', action='store_true',
4280 dest='skip_title',
4281 help='Use the most recent commit message as the title of '
4282 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004283 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004284 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004285 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004286 parser.add_option('--tbrs',
4287 action='append', default=[],
4288 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004289 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004290 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004291 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004292 parser.add_option('--hashtag', dest='hashtags',
4293 action='append', default=[],
4294 help=('Gerrit hashtag for new CL; '
4295 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004296 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004297 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004298 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004299 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004300 metavar='TARGET',
4301 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004302 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004303 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004304 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004305 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004306 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004307 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004308 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004309 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4310 const='TBR', help='add a set of OWNERS to TBR')
4311 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4312 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004313 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004314 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004315 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004316 'implies --send-mail')
4317 parser.add_option('-d', '--cq-dry-run',
4318 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004319 help='Send the patchset to do a CQ dry run right after '
4320 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004321 parser.add_option(
4322 '-q',
4323 '--cq-quick-run',
4324 action='store_true',
4325 default=False,
4326 help='Send the patchset to do a CQ quick run right after '
4327 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4328 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004329 parser.add_option('--set-bot-commit', action='store_true',
4330 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004331 parser.add_option('--preserve-tryjobs', action='store_true',
4332 help='instruct the CQ to let tryjobs running even after '
4333 'new patchsets are uploaded instead of canceling '
4334 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004335 parser.add_option('--dependencies', action='store_true',
4336 help='Uploads CLs of all the local branches that depend on '
4337 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004338 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4339 help='Sends your change to the CQ after an approval. Only '
4340 'works on repos that have the Auto-Submit label '
4341 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004342 parser.add_option('--parallel', action='store_true',
4343 help='Run all tests specified by input_api.RunTests in all '
4344 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004345 parser.add_option('--no-autocc', action='store_true',
4346 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004347 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004348 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004349 parser.add_option('-R', '--retry-failed', action='store_true',
4350 help='Retry failed tryjobs from old patchset immediately '
4351 'after uploading new patchset. Cannot be used with '
4352 '--use-commit-queue or --cq-dry-run.')
4353 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4354 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004355 parser.add_option('--fixed', '-x',
4356 help='List of bugs that will be commented on and marked '
4357 'fixed (pre-populates "Fixed:" tag). Same format as '
4358 '-b option / "Bug:" tag. If fixing several issues, '
4359 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004360 parser.add_option('--edit-description', action='store_true', default=False,
4361 help='Modify description before upload. Cannot be used '
4362 'with --force. It is a noop when --no-squash is set '
4363 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004364 parser.add_option('--git-completion-helper', action="store_true",
4365 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004366 parser.add_option('--resultdb', action='store_true',
4367 help='Run presubmit checks in the ResultSink environment '
4368 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004369 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004370 parser.add_option('-o',
4371 '--push-options',
4372 action='append',
4373 default=[],
4374 help='Transmit the given string to the server when '
4375 'performing git push (pass-through). See git-push '
4376 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004377 parser.add_option('--no-add-changeid',
4378 action='store_true',
4379 dest='no_add_changeid',
4380 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004381
rmistry@google.com2dd99862015-06-22 12:22:18 +00004382 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004383 (options, args) = parser.parse_args(args)
4384
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004385 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004386 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4387 if opt.help != optparse.SUPPRESS_HELP))
4388 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004389
sbc@chromium.org71437c02015-04-09 19:29:40 +00004390 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004391 return 1
4392
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004393 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004394 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004395 options.cc = cleanup_list(options.cc)
4396
Josipe827b0f2020-01-30 00:07:20 +00004397 if options.edit_description and options.force:
4398 parser.error('Only one of --force and --edit-description allowed')
4399
tandriib80458a2016-06-23 12:20:07 -07004400 if options.message_file:
4401 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004402 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004403 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004404
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004405 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004406 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004407 options.use_commit_queue,
4408 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004409 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4410 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004411
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004412 if options.skip_title and options.title:
4413 parser.error('Only one of --title and --skip-title allowed.')
4414
Aaron Gableedbc4132017-09-11 13:22:28 -07004415 if options.use_commit_queue:
4416 options.send_mail = True
4417
Edward Lesmes0dd54822020-03-26 18:24:25 +00004418 if options.squash is None:
4419 # Load default for user, repo, squash=true, in this order.
4420 options.squash = settings.GetSquashGerritUploads()
4421
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004422 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004423 # Warm change details cache now to avoid RPCs later, reducing latency for
4424 # developers.
4425 if cl.GetIssue():
4426 cl._GetChangeDetail(
4427 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4428
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004429 if options.retry_failed and not cl.GetIssue():
4430 print('No previous patchsets, so --retry-failed has no effect.')
4431 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004432
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004433 # cl.GetMostRecentPatchset uses cached information, and can return the last
4434 # patchset before upload. Calling it here makes it clear that it's the
4435 # last patchset before upload. Note that GetMostRecentPatchset will fail
4436 # if no CL has been uploaded yet.
4437 if options.retry_failed:
4438 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004439
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004440 ret = cl.CMDUpload(options, args, orig_args)
4441
4442 if options.retry_failed:
4443 if ret != 0:
4444 print('Upload failed, so --retry-failed has no effect.')
4445 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004446 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004447 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004448 jobs = _filter_failed_for_retry(builds)
4449 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004450 print('No failed tryjobs, so --retry-failed has no effect.')
4451 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004452 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004453
4454 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004455
4456
Francois Dorayd42c6812017-05-30 15:10:20 -04004457@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004458@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004459def CMDsplit(parser, args):
4460 """Splits a branch into smaller branches and uploads CLs.
4461
4462 Creates a branch and uploads a CL for each group of files modified in the
4463 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004464 comment, the string '$directory', is replaced with the directory containing
4465 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004466 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004467 parser.add_option('-d', '--description', dest='description_file',
4468 help='A text file containing a CL description in which '
4469 '$directory will be replaced by each CL\'s directory.')
4470 parser.add_option('-c', '--comment', dest='comment_file',
4471 help='A text file containing a CL comment.')
4472 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004473 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004474 help='List the files and reviewers for each CL that would '
4475 'be created, but don\'t create branches or CLs.')
4476 parser.add_option('--cq-dry-run', action='store_true',
4477 help='If set, will do a cq dry run for each uploaded CL. '
4478 'Please be careful when doing this; more than ~10 CLs '
4479 'has the potential to overload our build '
4480 'infrastructure. Try to upload these not during high '
4481 'load times (usually 11-3 Mountain View time). Email '
4482 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004483 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4484 default=True,
4485 help='Sends your change to the CQ after an approval. Only '
4486 'works on repos that have the Auto-Submit label '
4487 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004488 options, _ = parser.parse_args(args)
4489
4490 if not options.description_file:
4491 parser.error('No --description flag specified.')
4492
4493 def WrappedCMDupload(args):
4494 return CMDupload(OptionParser(), args)
4495
Edward Lemur2c62b332020-03-12 22:12:33 +00004496 return split_cl.SplitCl(
4497 options.description_file, options.comment_file, Changelist,
4498 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4499 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004500
4501
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004502@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004503@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004504def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004505 """DEPRECATED: Used to commit the current changelist via git-svn."""
4506 message = ('git-cl no longer supports committing to SVN repositories via '
4507 'git-svn. You probably want to use `git cl land` instead.')
4508 print(message)
4509 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004510
4511
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004512@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004513@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004514def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004515 """Commits the current changelist via git.
4516
4517 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4518 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004519 """
4520 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4521 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004522 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004523 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004524 parser.add_option('--parallel', action='store_true',
4525 help='Run all tests specified by input_api.RunTests in all '
4526 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004527 parser.add_option('--resultdb', action='store_true',
4528 help='Run presubmit checks in the ResultSink environment '
4529 'and send results to the ResultDB database.')
4530 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004531 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004532
Edward Lemur934836a2019-09-09 20:16:54 +00004533 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004534
Robert Iannucci2e73d432018-03-14 01:10:47 -07004535 if not cl.GetIssue():
4536 DieWithError('You must upload the change first to Gerrit.\n'
4537 ' If you would rather have `git cl land` upload '
4538 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004539 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4540 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541
4542
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004543@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004544@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004546 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547 parser.add_option('-b', dest='newbranch',
4548 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004549 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004550 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004551 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004552 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004553
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004554 group = optparse.OptionGroup(
4555 parser,
4556 'Options for continuing work on the current issue uploaded from a '
4557 'different clone (e.g. different machine). Must be used independently '
4558 'from the other options. No issue number should be specified, and the '
4559 'branch must have an issue number associated with it')
4560 group.add_option('--reapply', action='store_true', dest='reapply',
4561 help='Reset the branch and reapply the issue.\n'
4562 'CAUTION: This will undo any local changes in this '
4563 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004564
4565 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004566 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004567 parser.add_option_group(group)
4568
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004570
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004571 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004572 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004573 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004574 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004575 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004576
Edward Lemur934836a2019-09-09 20:16:54 +00004577 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004578 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004580
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004581 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004582 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004583 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004584
4585 RunGit(['reset', '--hard', upstream])
4586 if options.pull:
4587 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004588
Edward Lemur678a6842019-10-03 22:25:05 +00004589 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004590 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4591 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004592
4593 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004594 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004595
Edward Lemurf38bc172019-09-03 21:02:13 +00004596 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004597 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004598 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004599
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004600 # We don't want uncommitted changes mixed up with the patch.
4601 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004602 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004604 if options.newbranch:
4605 if options.force:
4606 RunGit(['branch', '-D', options.newbranch],
4607 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004608 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004609
Edward Lemur678a6842019-10-03 22:25:05 +00004610 cl = Changelist(
4611 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004612
Edward Lemur678a6842019-10-03 22:25:05 +00004613 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004614 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004615
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004616 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4617 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004618
4619
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004620def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004621 """Fetches the tree status and returns either 'open', 'closed',
4622 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004623 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004624 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004625 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 if status.find('closed') != -1 or status == '0':
4627 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004628
4629 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004630 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004631
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004632 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004633 return 'unset'
4634
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004635
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004636def GetTreeStatusReason():
4637 """Fetches the tree status from a json url and returns the message
4638 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004639 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004640 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004641 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004642 status = json.loads(connection.read())
4643 connection.close()
4644 return status['message']
4645
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004646
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004647@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004648def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004649 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004650 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004651 status = GetTreeStatus()
4652 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004653 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004654 return 2
4655
vapiera7fbd5a2016-06-16 09:17:49 -07004656 print('The tree is %s' % status)
4657 print()
4658 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004659 if status != 'open':
4660 return 1
4661 return 0
4662
4663
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004664@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004665def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004666 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4667 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004668 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004669 '-b', '--bot', action='append',
4670 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4671 'times to specify multiple builders. ex: '
4672 '"-b win_rel -b win_layout". See '
4673 'the try server waterfall for the builders name and the tests '
4674 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004675 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004676 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004677 help=('Buildbucket bucket to send the try requests. Format: '
4678 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004679 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004680 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004681 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004682 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004683 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004684 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004685 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004686 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004687 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004688 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004689 '-q',
4690 '--quick-run',
4691 action='store_true',
4692 default=False,
4693 help='trigger in quick run mode '
4694 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4695 'uick_run.md) (chromium only).')
4696 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004697 '--category', default='git_cl_try', help='Specify custom build category.')
4698 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004699 '--project',
4700 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004701 'in recipe to determine to which repository or directory to '
4702 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004703 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004704 '-p', '--property', dest='properties', action='append', default=[],
4705 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004706 'key2=value2 etc. The value will be treated as '
4707 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004708 'NOTE: using this may make your tryjob not usable for CQ, '
4709 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004710 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004711 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4712 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004713 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004714 parser.add_option(
4715 '-R', '--retry-failed', action='store_true', default=False,
4716 help='Retry failed jobs from the latest set of tryjobs. '
4717 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004718 parser.add_option(
4719 '-i', '--issue', type=int,
4720 help='Operate on this issue instead of the current branch\'s implicit '
4721 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004722 options, args = parser.parse_args(args)
4723
machenbach@chromium.org45453142015-09-15 08:45:22 +00004724 # Make sure that all properties are prop=value pairs.
4725 bad_params = [x for x in options.properties if '=' not in x]
4726 if bad_params:
4727 parser.error('Got properties with missing "=": %s' % bad_params)
4728
maruel@chromium.org15192402012-09-06 12:38:29 +00004729 if args:
4730 parser.error('Unknown arguments: %s' % args)
4731
Edward Lemur934836a2019-09-09 20:16:54 +00004732 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004733 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004734 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004735
Edward Lemurf38bc172019-09-03 21:02:13 +00004736 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004737 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004738
tandriie113dfd2016-10-11 10:20:12 -07004739 error_message = cl.CannotTriggerTryJobReason()
4740 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004741 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004742
Edward Lemur45768512020-03-02 19:03:14 +00004743 if options.bot:
4744 if options.retry_failed:
4745 parser.error('--bot is not compatible with --retry-failed.')
4746 if not options.bucket:
4747 parser.error('A bucket (e.g. "chromium/try") is required.')
4748
4749 triggered = [b for b in options.bot if 'triggered' in b]
4750 if triggered:
4751 parser.error(
4752 'Cannot schedule builds on triggered bots: %s.\n'
4753 'This type of bot requires an initial job from a parent (usually a '
4754 'builder). Schedule a job on the parent instead.\n' % triggered)
4755
4756 if options.bucket.startswith('.master'):
4757 parser.error('Buildbot masters are not supported.')
4758
4759 project, bucket = _parse_bucket(options.bucket)
4760 if project is None or bucket is None:
4761 parser.error('Invalid bucket: %s.' % options.bucket)
4762 jobs = sorted((project, bucket, bot) for bot in options.bot)
4763 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004764 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004765 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004766 if options.verbose:
4767 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004768 jobs = _filter_failed_for_retry(builds)
4769 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004770 print('There are no failed jobs in the latest set of jobs '
4771 '(patchset #%d), doing nothing.' % patchset)
4772 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004773 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004774 if num_builders > 10:
4775 confirm_or_exit('There are %d builders with failed builds.'
4776 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004777 elif options.quick_run:
4778 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4779 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004780 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004781 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004782 print('git cl try with no bots now defaults to CQ dry run.')
4783 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4784 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004785
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004786 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004787 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004788 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004789 except BuildbucketResponseException as ex:
4790 print('ERROR: %s' % ex)
4791 return 1
4792 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004793
4794
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004795@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004796def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004797 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004798 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004799 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004800 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004801 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004802 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004803 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004804 '--color', action='store_true', default=setup_color.IS_TTY,
4805 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004806 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004807 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4808 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004809 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004810 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004811 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004812 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004813 parser.add_option(
4814 '-i', '--issue', type=int,
4815 help='Operate on this issue instead of the current branch\'s implicit '
4816 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004817 options, args = parser.parse_args(args)
4818 if args:
4819 parser.error('Unrecognized args: %s' % ' '.join(args))
4820
Edward Lemur934836a2019-09-09 20:16:54 +00004821 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004822 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004823 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004824
tandrii221ab252016-10-06 08:12:04 -07004825 patchset = options.patchset
4826 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004827 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004828 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004829 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004830 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004831 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004832 cl.GetIssue())
4833
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004834 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004835 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004836 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004837 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004838 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004839 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004840 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004841 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004842 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004843 return 0
4844
4845
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004846@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004847@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004848def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004849 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004850 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004851 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004852 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004854 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004855 if args:
4856 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004857 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004858 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004859 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004860 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004861
4862 # Clear configured merge-base, if there is one.
4863 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004864 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004865 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004866 return 0
4867
4868
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004869@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004870def CMDweb(parser, args):
4871 """Opens the current CL in the web browser."""
4872 _, args = parser.parse_args(args)
4873 if args:
4874 parser.error('Unrecognized args: %s' % ' '.join(args))
4875
4876 issue_url = Changelist().GetIssueURL()
4877 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004878 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004879 return 1
4880
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004881 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004882 # allows us to hide the "Created new window in existing browser session."
4883 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004884 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004885 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004886 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004887 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004888 os.open(os.devnull, os.O_RDWR)
4889 try:
4890 webbrowser.open(issue_url)
4891 finally:
4892 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004893 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004894 return 0
4895
4896
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004897@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004898def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004899 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004900 parser.add_option('-d', '--dry-run', action='store_true',
4901 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004902 parser.add_option(
4903 '-q',
4904 '--quick-run',
4905 action='store_true',
4906 help='trigger in quick run mode '
4907 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4908 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004909 parser.add_option('-c', '--clear', action='store_true',
4910 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004911 parser.add_option(
4912 '-i', '--issue', type=int,
4913 help='Operate on this issue instead of the current branch\'s implicit '
4914 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004915 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004916 if args:
4917 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004918 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4919 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004920
Edward Lemur934836a2019-09-09 20:16:54 +00004921 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004922 if not cl.GetIssue():
4923 parser.error('Must upload the issue first.')
4924
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004925 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004926 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004927 elif options.quick_run:
4928 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004929 elif options.dry_run:
4930 state = _CQState.DRY_RUN
4931 else:
4932 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004933 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004934 return 0
4935
4936
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004937@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004938def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004939 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004940 parser.add_option(
4941 '-i', '--issue', type=int,
4942 help='Operate on this issue instead of the current branch\'s implicit '
4943 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004944 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004945 if args:
4946 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004947 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004948 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004949 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004950 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004951 cl.CloseIssue()
4952 return 0
4953
4954
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004955@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004956def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004957 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004958 parser.add_option(
4959 '--stat',
4960 action='store_true',
4961 dest='stat',
4962 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004963 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004964 if args:
4965 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004966
Edward Lemur934836a2019-09-09 20:16:54 +00004967 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004968 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004969 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004970 if not issue:
4971 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004972
Aaron Gablea718c3e2017-08-28 17:47:28 -07004973 base = cl._GitGetBranchConfigValue('last-upload-hash')
4974 if not base:
4975 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4976 if not base:
4977 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4978 revision_info = detail['revisions'][detail['current_revision']]
4979 fetch_info = revision_info['fetch']['http']
4980 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4981 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004982
Aaron Gablea718c3e2017-08-28 17:47:28 -07004983 cmd = ['git', 'diff']
4984 if options.stat:
4985 cmd.append('--stat')
4986 cmd.append(base)
4987 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004988
4989 return 0
4990
4991
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004992@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004993def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004994 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004995 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004996 '--ignore-current',
4997 action='store_true',
4998 help='Ignore the CL\'s current reviewers and start from scratch.')
4999 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005000 '--ignore-self',
5001 action='store_true',
5002 help='Do not consider CL\'s author as an owners.')
5003 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005004 '--no-color',
5005 action='store_true',
5006 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005007 parser.add_option(
5008 '--batch',
5009 action='store_true',
5010 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005011 # TODO: Consider moving this to another command, since other
5012 # git-cl owners commands deal with owners for a given CL.
5013 parser.add_option(
5014 '--show-all',
5015 action='store_true',
5016 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005017 options, args = parser.parse_args(args)
5018
Edward Lemur934836a2019-09-09 20:16:54 +00005019 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005020 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005021
Yang Guo6e269a02019-06-26 11:17:02 +00005022 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005023 if len(args) == 0:
5024 print('No files specified for --show-all. Nothing to do.')
5025 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005026 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005027 for path in args:
5028 print('Owners for %s:' % path)
5029 print('\n'.join(
5030 ' - %s' % owner
5031 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005032 return 0
5033
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005034 if args:
5035 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005036 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005037 base_branch = args[0]
5038 else:
5039 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005040 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005041
Edward Lemur2c62b332020-03-12 22:12:33 +00005042 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005043
5044 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005045 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5046 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005047 return 0
5048
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005049 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005050 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005051 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005052 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005053 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005054 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005055 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005056
5057
Aiden Bennerc08566e2018-10-03 17:52:42 +00005058def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005059 """Generates a diff command."""
5060 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005061 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5062
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005063 if allow_prefix:
5064 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5065 # case that diff.noprefix is set in the user's git config.
5066 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5067 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005068 diff_cmd += ['--no-prefix']
5069
5070 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005071
5072 if args:
5073 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005074 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005075 diff_cmd.append(arg)
5076 else:
5077 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005078
5079 return diff_cmd
5080
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005081
Jamie Madill5e96ad12020-01-13 16:08:35 +00005082def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5083 """Runs clang-format-diff and sets a return value if necessary."""
5084
5085 if not clang_diff_files:
5086 return 0
5087
5088 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5089 # formatted. This is used to block during the presubmit.
5090 return_value = 0
5091
5092 # Locate the clang-format binary in the checkout
5093 try:
5094 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5095 except clang_format.NotFoundError as e:
5096 DieWithError(e)
5097
5098 if opts.full or settings.GetFormatFullByDefault():
5099 cmd = [clang_format_tool]
5100 if not opts.dry_run and not opts.diff:
5101 cmd.append('-i')
5102 if opts.dry_run:
5103 for diff_file in clang_diff_files:
5104 with open(diff_file, 'r') as myfile:
5105 code = myfile.read().replace('\r\n', '\n')
5106 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5107 stdout = stdout.replace('\r\n', '\n')
5108 if opts.diff:
5109 sys.stdout.write(stdout)
5110 if code != stdout:
5111 return_value = 2
5112 else:
5113 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5114 if opts.diff:
5115 sys.stdout.write(stdout)
5116 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005117 try:
5118 script = clang_format.FindClangFormatScriptInChromiumTree(
5119 'clang-format-diff.py')
5120 except clang_format.NotFoundError as e:
5121 DieWithError(e)
5122
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005123 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005124 if not opts.dry_run and not opts.diff:
5125 cmd.append('-i')
5126
5127 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005128 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005129
Edward Lesmes89624cd2020-04-06 17:51:56 +00005130 env = os.environ.copy()
5131 env['PATH'] = (
5132 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5133 stdout = RunCommand(
5134 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005135 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005136 if opts.diff:
5137 sys.stdout.write(stdout)
5138 if opts.dry_run and len(stdout) > 0:
5139 return_value = 2
5140
5141 return return_value
5142
5143
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005144def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5145 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5146 presubmit checks have failed (and returns 0 otherwise)."""
5147
5148 if not rust_diff_files:
5149 return 0
5150
5151 # Locate the rustfmt binary.
5152 try:
5153 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5154 except rustfmt.NotFoundError as e:
5155 DieWithError(e)
5156
5157 # TODO(crbug.com/1231317): Support formatting only the changed lines
5158 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5159 # https://github.com/emilio/rustfmt-format-diff
5160 cmd = [rustfmt_tool]
5161 if opts.dry_run:
5162 cmd.append('--check')
5163 cmd += rust_diff_files
5164 rustfmt_exitcode = subprocess2.call(cmd)
5165
5166 if opts.presubmit and rustfmt_exitcode != 0:
5167 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005168
5169 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005170
5171
Olivier Robin0a6b5442022-04-07 07:25:04 +00005172def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5173 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5174 that presubmit checks have failed (and returns 0 otherwise)."""
5175
5176 if not swift_diff_files:
5177 return 0
5178
5179 # Locate the swift-format binary.
5180 try:
5181 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5182 except swift_format.NotFoundError as e:
5183 DieWithError(e)
5184
5185 cmd = [swift_format_tool]
5186 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005187 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005188 else:
5189 cmd += ['format', '-i']
5190 cmd += swift_diff_files
5191 swift_format_exitcode = subprocess2.call(cmd)
5192
5193 if opts.presubmit and swift_format_exitcode != 0:
5194 return 2
5195
5196 return 0
5197
5198
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005199def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005200 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005201 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005202
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005203
enne@chromium.org555cfe42014-01-29 18:21:39 +00005204@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005205@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005206def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005207 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005208 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005209 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005210 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005211 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005212 parser.add_option('--full', action='store_true',
5213 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005214 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005215 parser.add_option('--dry-run', action='store_true',
5216 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005217 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005218 '--no-clang-format',
5219 dest='clang_format',
5220 action='store_false',
5221 default=True,
5222 help='Disables formatting of various file types using clang-format.')
5223 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005224 '--python',
5225 action='store_true',
5226 default=None,
5227 help='Enables python formatting on all python files.')
5228 parser.add_option(
5229 '--no-python',
5230 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005231 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005232 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005233 'If neither --python or --no-python are set, python files that have a '
5234 '.style.yapf file in an ancestor directory will be formatted. '
5235 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005236 parser.add_option(
5237 '--js',
5238 action='store_true',
5239 help='Format javascript code with clang-format. '
5240 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005241 parser.add_option('--diff', action='store_true',
5242 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005243 parser.add_option('--presubmit', action='store_true',
5244 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005245
5246 parser.add_option('--rust-fmt',
5247 dest='use_rust_fmt',
5248 action='store_true',
5249 default=rustfmt.IsRustfmtSupported(),
5250 help='Enables formatting of Rust file types using rustfmt.')
5251 parser.add_option(
5252 '--no-rust-fmt',
5253 dest='use_rust_fmt',
5254 action='store_false',
5255 help='Disables formatting of Rust file types using rustfmt.')
5256
Olivier Robin0a6b5442022-04-07 07:25:04 +00005257 parser.add_option(
5258 '--swift-format',
5259 dest='use_swift_format',
5260 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005261 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005262 help='Enables formatting of Swift file types using swift-format '
5263 '(macOS host only).')
5264 parser.add_option(
5265 '--no-swift-format',
5266 dest='use_swift_format',
5267 action='store_false',
5268 help='Disables formatting of Swift file types using swift-format.')
5269
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005270 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005271
Garrett Beaty91a6f332020-01-06 16:57:24 +00005272 if opts.python is not None and opts.no_python:
5273 raise parser.error('Cannot set both --python and --no-python')
5274 if opts.no_python:
5275 opts.python = False
5276
Daniel Chengc55eecf2016-12-30 03:11:02 -08005277 # Normalize any remaining args against the current path, so paths relative to
5278 # the current directory are still resolved as expected.
5279 args = [os.path.join(os.getcwd(), arg) for arg in args]
5280
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005281 # git diff generates paths against the root of the repository. Change
5282 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005283 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005284 if rel_base_path:
5285 os.chdir(rel_base_path)
5286
digit@chromium.org29e47272013-05-17 17:01:46 +00005287 # Grab the merge-base commit, i.e. the upstream commit of the current
5288 # branch when it was created or the last time it was rebased. This is
5289 # to cover the case where the user may have called "git fetch origin",
5290 # moving the origin branch to a newer commit, but hasn't rebased yet.
5291 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005292 upstream_branch = opts.upstream
5293 if not upstream_branch:
5294 cl = Changelist()
5295 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005296 if upstream_branch:
5297 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5298 upstream_commit = upstream_commit.strip()
5299
5300 if not upstream_commit:
5301 DieWithError('Could not find base commit for this branch. '
5302 'Are you in detached state?')
5303
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005304 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5305 diff_output = RunGit(changed_files_cmd)
5306 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005307 # Filter out files deleted by this CL
5308 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005309
Andreas Haas417d89c2020-02-06 10:24:27 +00005310 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005311 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005312
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005313 clang_diff_files = []
5314 if opts.clang_format:
5315 clang_diff_files = [
5316 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5317 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005318 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005319 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005320 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005321 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005322
Edward Lesmes50da7702020-03-30 19:23:43 +00005323 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005324
Jamie Madill5e96ad12020-01-13 16:08:35 +00005325 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5326 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005327
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005328 if opts.use_rust_fmt:
5329 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5330 upstream_commit)
5331 if rust_fmt_return_value == 2:
5332 return_value = 2
5333
Olivier Robin0a6b5442022-04-07 07:25:04 +00005334 if opts.use_swift_format:
5335 if sys.platform != 'darwin':
5336 DieWithError('swift-format is only supported on macOS.')
5337 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5338 upstream_commit)
5339 if swift_format_return_value == 2:
5340 return_value = 2
5341
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005342 # Similar code to above, but using yapf on .py files rather than clang-format
5343 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005344 py_explicitly_disabled = opts.python is not None and not opts.python
5345 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005346 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5347 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005348
Aiden Bennerc08566e2018-10-03 17:52:42 +00005349 # Used for caching.
5350 yapf_configs = {}
5351 for f in python_diff_files:
5352 # Find the yapf style config for the current file, defaults to depot
5353 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005354 _FindYapfConfigFile(f, yapf_configs, top_dir)
5355
5356 # Turn on python formatting by default if a yapf config is specified.
5357 # This breaks in the case of this repo though since the specified
5358 # style file is also the global default.
5359 if opts.python is None:
5360 filtered_py_files = []
5361 for f in python_diff_files:
5362 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5363 filtered_py_files.append(f)
5364 else:
5365 filtered_py_files = python_diff_files
5366
5367 # Note: yapf still seems to fix indentation of the entire file
5368 # even if line ranges are specified.
5369 # See https://github.com/google/yapf/issues/499
5370 if not opts.full and filtered_py_files:
5371 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5372
Brian Sheedyb4307d52019-12-02 19:18:17 +00005373 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5374 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5375 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005376
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005377 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005378 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5379 # Default to pep8 if not .style.yapf is found.
5380 if not yapf_style:
5381 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005382
Peter Wend9399922020-06-17 17:33:49 +00005383 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005384 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005385 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005386 else:
5387 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005388
5389 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005390
5391 has_formattable_lines = False
5392 if not opts.full:
5393 # Only run yapf over changed line ranges.
5394 for diff_start, diff_len in py_line_diffs[f]:
5395 diff_end = diff_start + diff_len - 1
5396 # Yapf errors out if diff_end < diff_start but this
5397 # is a valid line range diff for a removal.
5398 if diff_end >= diff_start:
5399 has_formattable_lines = True
5400 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5401 # If all line diffs were removals we have nothing to format.
5402 if not has_formattable_lines:
5403 continue
5404
5405 if opts.diff or opts.dry_run:
5406 cmd += ['--diff']
5407 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005408 stdout = RunCommand(cmd,
5409 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005410 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005411 cwd=top_dir,
5412 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005413 if opts.diff:
5414 sys.stdout.write(stdout)
5415 elif len(stdout) > 0:
5416 return_value = 2
5417 else:
5418 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005419 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005420
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005421 # Format GN build files. Always run on full build files for canonical form.
5422 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005423 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005424 if opts.dry_run or opts.diff:
5425 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005426 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005427 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005428 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005429 cwd=top_dir)
5430 if opts.dry_run and gn_ret == 2:
5431 return_value = 2 # Not formatted.
5432 elif opts.diff and gn_ret == 2:
5433 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005434 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005435 elif gn_ret != 0:
5436 # For non-dry run cases (and non-2 return values for dry-run), a
5437 # nonzero error code indicates a failure, probably because the file
5438 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005439 DieWithError('gn format failed on ' + gn_diff_file +
5440 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005441
Ilya Shermane081cbe2017-08-15 17:51:04 -07005442 # Skip the metrics formatting from the global presubmit hook. These files have
5443 # a separate presubmit hook that issues an error if the files need formatting,
5444 # whereas the top-level presubmit script merely issues a warning. Formatting
5445 # these files is somewhat slow, so it's important not to duplicate the work.
5446 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005447 for diff_xml in GetDiffXMLs(diff_files):
5448 xml_dir = GetMetricsDir(diff_xml)
5449 if not xml_dir:
5450 continue
5451
Ilya Shermane081cbe2017-08-15 17:51:04 -07005452 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005453 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5454 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005455
5456 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5457 # command as histograms/pretty_print.py now needs a relative path argument
5458 # after splitting the histograms into multiple directories.
5459 # For example, in tools/metrics/ukm, pretty-print could be run using:
5460 # $ python pretty_print.py
5461 # But in tools/metrics/histogrmas, pretty-print should be run with an
5462 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005463 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005464 # $ python pretty_print.py enums.xml
5465
5466 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5467 # version of histograms/pretty_print.py is released.
5468 filepath_required = os.path.exists(
5469 os.path.join(tool_dir, 'validate_prefix.py'))
5470
Weilun Shib92c4b72020-08-27 17:45:11 +00005471 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5472 or diff_xml.endswith('histogram_suffixes_list.xml')
5473 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005474 cmd.append(diff_xml)
5475
Ilya Shermane081cbe2017-08-15 17:51:04 -07005476 if opts.dry_run or opts.diff:
5477 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005478
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005479 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5480 # `shell` param and instead replace `'vpython'` with
5481 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005482 stdout = RunCommand(cmd,
5483 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005484 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005485 if opts.diff:
5486 sys.stdout.write(stdout)
5487 if opts.dry_run and stdout:
5488 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005489
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005490 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005491
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005492
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005493def GetDiffXMLs(diff_files):
5494 return [
5495 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5496 ]
5497
5498
5499def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005500 metrics_xml_dirs = [
5501 os.path.join('tools', 'metrics', 'actions'),
5502 os.path.join('tools', 'metrics', 'histograms'),
5503 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005504 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005505 os.path.join('tools', 'metrics', 'ukm'),
5506 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005507 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005508 if diff_xml.startswith(xml_dir):
5509 return xml_dir
5510 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005511
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005512
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005513@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005514@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005515def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005516 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005517 _, args = parser.parse_args(args)
5518
5519 if len(args) != 1:
5520 parser.print_help()
5521 return 1
5522
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005523 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005524 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005525 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005526
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005527 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005528
Edward Lemur52969c92020-02-06 18:15:28 +00005529 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005530 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005531 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005532
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005533 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005534 for key, issue in [x.split() for x in output.splitlines()]:
5535 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005536 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005537
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005538 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005539 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005540 return 1
5541 if len(branches) == 1:
5542 RunGit(['checkout', branches[0]])
5543 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005544 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005545 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005546 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005547 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005548 try:
5549 RunGit(['checkout', branches[int(which)]])
5550 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005551 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005552 return 1
5553
5554 return 0
5555
5556
maruel@chromium.org29404b52014-09-08 22:58:00 +00005557def CMDlol(parser, args):
5558 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005559 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005560 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5561 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5562 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005563 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005564 return 0
5565
5566
Josip Sokcevic0399e172022-03-21 23:11:51 +00005567def CMDversion(parser, args):
5568 import utils
5569 print(utils.depot_tools_version())
5570
5571
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005572class OptionParser(optparse.OptionParser):
5573 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005574
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005575 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005576 optparse.OptionParser.__init__(
5577 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005578 self.add_option(
5579 '-v', '--verbose', action='count', default=0,
5580 help='Use 2 times for more debugging info')
5581
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005582 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005583 try:
5584 return self._parse_args(args)
5585 finally:
5586 # Regardless of success or failure of args parsing, we want to report
5587 # metrics, but only after logging has been initialized (if parsing
5588 # succeeded).
5589 global settings
5590 settings = Settings()
5591
Edward Lesmes9c349062021-05-06 20:02:39 +00005592 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005593 # GetViewVCUrl ultimately calls logging method.
5594 project_url = settings.GetViewVCUrl().strip('/+')
5595 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5596 metrics.collector.add('project_urls', [project_url])
5597
5598 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005599 # Create an optparse.Values object that will store only the actual passed
5600 # options, without the defaults.
5601 actual_options = optparse.Values()
5602 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5603 # Create an optparse.Values object with the default options.
5604 options = optparse.Values(self.get_default_values().__dict__)
5605 # Update it with the options passed by the user.
5606 options._update_careful(actual_options.__dict__)
5607 # Store the options passed by the user in an _actual_options attribute.
5608 # We store only the keys, and not the values, since the values can contain
5609 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005610 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005611
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005612 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005613 logging.basicConfig(
5614 level=levels[min(options.verbose, len(levels) - 1)],
5615 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5616 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005617
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005618 return options, args
5619
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005620
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005621def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005622 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005623 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005624 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005625 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005626
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005627 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005628 dispatcher = subcommand.CommandDispatcher(__name__)
5629 try:
5630 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005631 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005632 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005633 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005634 if e.code != 500:
5635 raise
5636 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005637 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005638 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005639 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005640
5641
5642if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005643 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5644 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005645 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005646 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005647 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005648 sys.exit(main(sys.argv[1:]))