blob: 35767c19d7ae707819e611a58a757ae98e70fc9c [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
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000808 def GetIsGerrit(self):
809 """Return True if gerrit.host is set."""
810 if self.is_gerrit is None:
811 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
812 return self.is_gerrit
813
tandrii@chromium.org28253532016-04-14 13:46:56 +0000814 def GetGerritSkipEnsureAuthenticated(self):
815 """Return True if EnsureAuthenticated should not be done for Gerrit
816 uploads."""
817 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000818 self.gerrit_skip_ensure_authenticated = self._GetConfig(
819 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000820 return self.gerrit_skip_ensure_authenticated
821
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000822 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000823 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000824 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000825 # Git requires single quotes for paths with spaces. We need to replace
826 # them with double quotes for Windows to treat such paths as a single
827 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000828 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000829 return self.git_editor or None
830
thestig@chromium.org44202a22014-03-11 19:22:18 +0000831 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000832 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000833
834 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000835 return self._GetConfig(
836 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000837
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000838 def GetFormatFullByDefault(self):
839 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000840 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000841 result = (
842 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
843 error_ok=True).strip())
844 self.format_full_by_default = (result == 'true')
845 return self.format_full_by_default
846
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000847 def IsStatusCommitOrderByDate(self):
848 if self.is_status_commit_order_by_date is None:
849 result = (RunGit(['config', '--bool', 'cl.date-order'],
850 error_ok=True).strip())
851 self.is_status_commit_order_by_date = (result == 'true')
852 return self.is_status_commit_order_by_date
853
Edward Lemur26964072020-02-19 19:18:51 +0000854 def _GetConfig(self, key, default=''):
855 self._LazyUpdateIfNeeded()
856 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000857
858
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000859class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000860 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000861 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000862 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000863 DRY_RUN = 'dry_run'
864 COMMIT = 'commit'
865
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000866 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000867
868
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000869class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000870 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000871 self.issue = issue
872 self.patchset = patchset
873 self.hostname = hostname
874
875 @property
876 def valid(self):
877 return self.issue is not None
878
879
Edward Lemurf38bc172019-09-03 21:02:13 +0000880def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000881 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
882 fail_result = _ParsedIssueNumberArgument()
883
Edward Lemur678a6842019-10-03 22:25:05 +0000884 if isinstance(arg, int):
885 return _ParsedIssueNumberArgument(issue=arg)
886 if not isinstance(arg, basestring):
887 return fail_result
888
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000889 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000890 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700891
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000892 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000893 if not url.startswith('http'):
894 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000895 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
896 if url.startswith(short_url):
897 url = gerrit_url + url[len(short_url):]
898 break
899
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000900 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000901 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000902 except ValueError:
903 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200904
Alex Turner30ae6372022-01-04 02:32:52 +0000905 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
906 # URL.
907 if not arg.startswith('http') and '.' not in parsed_url.netloc:
908 return fail_result
909
Edward Lemur678a6842019-10-03 22:25:05 +0000910 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
911 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
912 # Short urls like https://domain/<issue_number> can be used, but don't allow
913 # specifying the patchset (you'd 404), but we allow that here.
914 if parsed_url.path == '/':
915 part = parsed_url.fragment
916 else:
917 part = parsed_url.path
918
919 match = re.match(
920 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
921 if not match:
922 return fail_result
923
924 issue = int(match.group('issue'))
925 patchset = match.group('patchset')
926 return _ParsedIssueNumberArgument(
927 issue=issue,
928 patchset=int(patchset) if patchset else None,
929 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930
931
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000932def _create_description_from_log(args):
933 """Pulls out the commit log to use as a base for the CL description."""
934 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000935 if len(args) == 1 and args[0] == None:
936 # Handle the case where None is passed as the branch.
937 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000938 if len(args) == 1 and not args[0].endswith('.'):
939 log_args = [args[0] + '..']
940 elif len(args) == 1 and args[0].endswith('...'):
941 log_args = [args[0][:-1]]
942 elif len(args) == 2:
943 log_args = [args[0] + '..' + args[1]]
944 else:
945 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000946 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000947
948
Aaron Gablea45ee112016-11-22 15:14:38 -0800949class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700950 def __init__(self, issue, url):
951 self.issue = issue
952 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800953 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700954
955 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800956 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700957 self.issue, self.url)
958
959
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100960_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000961 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100962 # TODO(tandrii): these two aren't known in Gerrit.
963 'approval', 'disapproval'])
964
965
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000966class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000967 """Changelist works with one changelist in local branch.
968
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000969 Notes:
970 * Not safe for concurrent multi-{thread,process} use.
971 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700972 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000973 """
974
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000975 def __init__(self,
976 branchref=None,
977 issue=None,
978 codereview_host=None,
979 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000980 """Create a new ChangeList instance.
981
Edward Lemurf38bc172019-09-03 21:02:13 +0000982 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000983 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000984 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000985 global settings
986 if not settings:
987 # Happens when git_cl.py is used as a utility library.
988 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000989
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000990 self.branchref = branchref
991 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000992 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000993 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994 else:
995 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000996 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000997 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000998 self.lookedup_issue = False
999 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001000 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001001 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001002 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001003 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001004 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001005 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001006 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001007
Edward Lemur125d60a2019-09-13 18:25:41 +00001008 # Lazily cached values.
1009 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1010 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001011 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001012 # Map from change number (issue) to its detail cache.
1013 self._detail_cache = {}
1014
1015 if codereview_host is not None:
1016 assert not codereview_host.startswith('https://'), codereview_host
1017 self._gerrit_host = codereview_host
1018 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001019
Edward Lesmese1576912021-02-16 21:53:34 +00001020 @property
1021 def owners_client(self):
1022 if self._owners_client is None:
1023 remote, remote_branch = self.GetRemoteBranch()
1024 branch = GetTargetRef(remote, remote_branch, None)
1025 self._owners_client = owners_client.GetCodeOwnersClient(
1026 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001027 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001028 host=self.GetGerritHost(),
1029 project=self.GetGerritProject(),
1030 branch=branch)
1031 return self._owners_client
1032
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001033 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001034 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001035
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001036 The return value is a string suitable for passing to git cl with the --cc
1037 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001038 """
1039 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001040 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001041 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001042 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1043 return self.cc
1044
Daniel Cheng7227d212017-11-17 08:12:37 -08001045 def ExtendCC(self, more_cc):
1046 """Extends the list of users to cc on this CL based on the changed files."""
1047 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001049 def GetCommitDate(self):
1050 """Returns the commit date as provided in the constructor"""
1051 return self.commit_date
1052
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001054 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001056 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001057 if not branchref:
1058 return None
1059 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001060 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001061 return self.branch
1062
1063 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001064 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001065 self.GetBranch() # Poke the lazy loader.
1066 return self.branchref
1067
Edward Lemur85153282020-02-14 22:06:29 +00001068 def _GitGetBranchConfigValue(self, key, default=None):
1069 return scm.GIT.GetBranchConfig(
1070 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001071
Edward Lemur85153282020-02-14 22:06:29 +00001072 def _GitSetBranchConfigValue(self, key, value):
1073 action = 'set %s to %r' % (key, value)
1074 if not value:
1075 action = 'unset %s' % key
1076 assert self.GetBranch(), 'a branch is needed to ' + action
1077 return scm.GIT.SetBranchConfig(
1078 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001079
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001080 @staticmethod
1081 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001082 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001083 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001084 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001085 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1086 settings.GetRoot(), branch)
1087 if not remote or not upstream_branch:
1088 DieWithError(
1089 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001090 'Verify this branch is set up to track another \n'
1091 '(via the --track argument to "git checkout -b ..."). \n'
1092 'or pass complete "git diff"-style arguments if supported, like\n'
1093 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094
1095 return remote, upstream_branch
1096
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001097 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001098 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001099 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001100 DieWithError('The upstream for the current branch (%s) does not exist '
1101 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001102 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001103 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 def GetUpstreamBranch(self):
1106 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001108 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001109 upstream_branch = upstream_branch.replace('refs/heads/',
1110 'refs/remotes/%s/' % remote)
1111 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1112 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 self.upstream_branch = upstream_branch
1114 return self.upstream_branch
1115
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001117 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001118 remote, branch = None, self.GetBranch()
1119 seen_branches = set()
1120 while branch not in seen_branches:
1121 seen_branches.add(branch)
1122 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001123 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 if remote != '.' or branch.startswith('refs/remotes'):
1125 break
1126 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001127 remotes = RunGit(['remote'], error_ok=True).split()
1128 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001129 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001130 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001132 logging.warning('Could not determine which remote this change is '
1133 'associated with, so defaulting to "%s".' %
1134 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001135 else:
Gavin Make6a62332020-12-04 21:57:10 +00001136 logging.warning('Could not determine which remote this change is '
1137 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001138 branch = 'HEAD'
1139 if branch.startswith('refs/remotes'):
1140 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001141 elif branch.startswith('refs/branch-heads/'):
1142 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001143 else:
1144 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001145 return self._remote
1146
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 def GetRemoteUrl(self):
1148 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1149
1150 Returns None if there is no remote.
1151 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001152 is_cached, value = self._cached_remote_url
1153 if is_cached:
1154 return value
1155
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001156 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001157 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001158
Edward Lemur298f2cf2019-02-22 21:40:39 +00001159 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001160 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001161 if host:
1162 self._cached_remote_url = (True, url)
1163 return url
1164
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001165 # If it cannot be parsed as an url, assume it is a local directory,
1166 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001167 logging.warning('"%s" doesn\'t appear to point to a git host. '
1168 'Interpreting it as a local directory.', url)
1169 if not os.path.isdir(url):
1170 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001171 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1172 'but it doesn\'t exist.',
1173 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001174 return None
1175
1176 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001177 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001178
Edward Lemur79d4f992019-11-11 23:49:02 +00001179 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001180 if not host:
1181 logging.error(
1182 'Remote "%(remote)s" for branch "%(branch)s" points to '
1183 '"%(cache_path)s", but it is misconfigured.\n'
1184 '"%(cache_path)s" must be a git repo and must have a remote named '
1185 '"%(remote)s" pointing to the git host.', {
1186 'remote': remote,
1187 'cache_path': cache_path,
1188 'branch': self.GetBranch()})
1189 return None
1190
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001191 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001192 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001194 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001195 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001196 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001197 if self.GetBranch():
1198 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001199 if self.issue is not None:
1200 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001201 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202 return self.issue
1203
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001204 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001206 issue = self.GetIssue()
1207 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001208 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001209 server = self.GetCodereviewServer()
1210 if short:
1211 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1212 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001213
Dirk Pranke6f0df682021-06-25 00:42:33 +00001214 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001215 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001216
Edward Lemur6c6827c2020-02-06 21:15:18 +00001217 def FetchDescription(self, pretty=False):
1218 assert self.GetIssue(), 'issue is required to query Gerrit'
1219
Edward Lemur9aa1a962020-02-25 00:58:38 +00001220 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001221 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1222 current_rev = data['current_revision']
1223 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001224
1225 if not pretty:
1226 return self.description
1227
1228 # Set width to 72 columns + 2 space indent.
1229 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1230 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1231 lines = self.description.splitlines()
1232 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233
1234 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001235 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001236 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001237 if self.GetBranch():
1238 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001239 if self.patchset is not None:
1240 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001241 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 return self.patchset
1243
Edward Lemur9aa1a962020-02-25 00:58:38 +00001244 def GetAuthor(self):
1245 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1246
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001248 """Set this branch's patchset. If patchset=0, clears the patchset."""
1249 assert self.GetBranch()
1250 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001251 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001252 else:
1253 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001254 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001256 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001257 """Set this branch's issue. If issue isn't given, clears the issue."""
1258 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001260 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001261 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001262 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001263 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001264 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001265 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001266 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 else:
tandrii5d48c322016-08-18 16:19:37 -07001268 # Reset all of these just to be clean.
1269 reset_suffixes = [
1270 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001271 ISSUE_CONFIG_KEY,
1272 PATCHSET_CONFIG_KEY,
1273 CODEREVIEW_SERVER_CONFIG_KEY,
1274 'gerritsquashhash',
1275 ]
tandrii5d48c322016-08-18 16:19:37 -07001276 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001277 try:
1278 self._GitSetBranchConfigValue(prop, None)
1279 except subprocess2.CalledProcessError:
1280 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001281 msg = RunGit(['log', '-1', '--format=%B']).strip()
1282 if msg and git_footers.get_footer_change_id(msg):
1283 print('WARNING: The change patched into this branch has a Change-Id. '
1284 'Removing it.')
1285 RunGit(['commit', '--amend', '-m',
1286 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001287 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001288 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001289 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290
Edward Lemur2c62b332020-03-12 22:12:33 +00001291 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001292 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001293 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001294 except subprocess2.CalledProcessError:
1295 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001296 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001297 'This branch probably doesn\'t exist anymore. To reset the\n'
1298 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001299 ' git branch --set-upstream-to origin/main %s\n'
1300 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001301 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001302
dsansomee2d6fd92016-09-08 00:10:47 -07001303 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001304 assert self.GetIssue(), 'issue is required to update description'
1305
1306 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001307 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001308 if not force:
1309 confirm_or_exit(
1310 'The description cannot be modified while the issue has a pending '
1311 'unpublished edit. Either publish the edit in the Gerrit web UI '
1312 'or delete it.\n\n', action='delete the unpublished edit')
1313
1314 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001315 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001316 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001317 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001318 description, notify='NONE')
1319
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001320 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001321
Edward Lemur75526302020-02-27 22:31:05 +00001322 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001323 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001324 '--root', settings.GetRoot(),
1325 '--upstream', upstream,
1326 ]
1327
1328 args.extend(['--verbose'] * verbose)
1329
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001330 remote, remote_branch = self.GetRemoteBranch()
1331 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001332 if settings.GetIsGerrit():
1333 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1334 args.extend(['--gerrit_project', self.GetGerritProject()])
1335 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001336
Edward Lemur99df04e2020-03-05 19:39:43 +00001337 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001338 issue = self.GetIssue()
1339 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001340 if author:
1341 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001342 if issue:
1343 args.extend(['--issue', str(issue)])
1344 if patchset:
1345 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001346
Edward Lemur75526302020-02-27 22:31:05 +00001347 return args
1348
Josip Sokcevic017544d2022-03-31 23:47:53 +00001349 def RunHook(self,
1350 committing,
1351 may_prompt,
1352 verbose,
1353 parallel,
1354 upstream,
1355 description,
1356 all_files,
1357 files=None,
1358 resultdb=False,
1359 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001360 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1361 args = self._GetCommonPresubmitArgs(verbose, upstream)
1362 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001363 if may_prompt:
1364 args.append('--may_prompt')
1365 if parallel:
1366 args.append('--parallel')
1367 if all_files:
1368 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001369 if files:
1370 args.extend(files.split(';'))
1371 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001372 if files or all_files:
1373 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001374
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001375 if resultdb and not realm:
1376 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1377 # it is not required to pass the realm flag
1378 print('Note: ResultDB reporting will NOT be performed because --realm'
1379 ' was not specified. To enable ResultDB, please run the command'
1380 ' again with the --realm argument to specify the LUCI realm.')
1381
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001382 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1383 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001384 if py3_results.get('skipped_presubmits', 1) == 0:
1385 print('No more presubmits to run - skipping Python 2 presubmits.')
1386 return py3_results
1387
1388 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1389 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001390 return self._MergePresubmitResults(py2_results, py3_results)
1391
1392 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1393 args = args[:]
1394 vpython = 'vpython3' if use_python3 else 'vpython'
1395
Edward Lemur227d5102020-02-25 23:45:35 +00001396 with gclient_utils.temporary_file() as description_file:
1397 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001398 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001399 args.extend(['--json_output', json_output])
1400 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001401 if self.GetUsePython3():
1402 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001403 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001404 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001405 if resultdb and realm:
1406 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001407
1408 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001409 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001410
Edward Lemur227d5102020-02-25 23:45:35 +00001411 metrics.collector.add_repeated('sub_commands', {
1412 'command': 'presubmit',
1413 'execution_time': time_time() - start,
1414 'exit_code': exit_code,
1415 })
1416
1417 if exit_code:
1418 sys.exit(exit_code)
1419
1420 json_results = gclient_utils.FileRead(json_output)
1421 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001422
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001423 def _MergePresubmitResults(self, py2_results, py3_results):
1424 return {
1425 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1426 py3_results.get('more_cc', []))),
1427 'errors': (
1428 py2_results.get('errors', []) + py3_results.get('errors', [])),
1429 'notifications': (
1430 py2_results.get('notifications', []) +
1431 py3_results.get('notifications', [])),
1432 'warnings': (
1433 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1434 }
1435
Edward Lemur75526302020-02-27 22:31:05 +00001436 def RunPostUploadHook(self, verbose, upstream, description):
1437 args = self._GetCommonPresubmitArgs(verbose, upstream)
1438 args.append('--post_upload')
1439
1440 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001441 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001442 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001443 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1444 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1445 ['--use-python3'])
1446 p_py2.wait()
1447 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001448
Edward Lemur5a644f82020-03-18 16:44:57 +00001449 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1450 # Get description message for upload.
1451 if self.GetIssue():
1452 description = self.FetchDescription()
1453 elif options.message:
1454 description = options.message
1455 else:
1456 description = _create_description_from_log(git_diff_args)
1457 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001458 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001459
Edward Lemur5a644f82020-03-18 16:44:57 +00001460 bug = options.bug
1461 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001462 if not self.GetIssue():
1463 # Extract bug number from branch name, but only if issue is being created.
1464 # It must start with bug or fix, followed by _ or - and number.
1465 # Optionally, it may contain _ or - after number with arbitrary text.
1466 # Examples:
1467 # bug-123
1468 # bug_123
1469 # fix-123
1470 # fix-123-some-description
1471 match = re.match(
1472 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1473 self.GetBranch())
1474 if not bug and not fixed and match:
1475 if match.group('type') == 'bug':
1476 bug = match.group('bugnum')
1477 else:
1478 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001479
1480 change_description = ChangeDescription(description, bug, fixed)
1481
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001482 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1483 if options.add_owners_to:
1484 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001485 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001486 files, [], options.tbrs + options.reviewers)
1487 missing_files = [
1488 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001489 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001490 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001491 owners = self.owners_client.SuggestOwners(
1492 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001493 if options.add_owners_to == 'TBR':
1494 assert isinstance(options.tbrs, list), options.tbrs
1495 options.tbrs.extend(owners)
1496 else:
1497 assert isinstance(options.reviewers, list), options.reviewers
1498 options.reviewers.extend(owners)
1499
Edward Lemur5a644f82020-03-18 16:44:57 +00001500 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001501 if options.reviewers or options.tbrs:
1502 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001503
1504 return change_description
1505
1506 def _GetTitleForUpload(self, options):
1507 # When not squashing, just return options.title.
1508 if not options.squash:
1509 return options.title
1510
1511 # On first upload, patchset title is always this string, while options.title
1512 # gets converted to first line of message.
1513 if not self.GetIssue():
1514 return 'Initial upload'
1515
1516 # When uploading subsequent patchsets, options.message is taken as the title
1517 # if options.title is not provided.
1518 if options.title:
1519 return options.title
1520 if options.message:
1521 return options.message.strip()
1522
1523 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001524 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001525 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001527 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001528
1529 # Use the default title if the user confirms the default with a 'y'.
1530 if user_title.lower() == 'y':
1531 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001532 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001533
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001534 def CMDUpload(self, options, git_diff_args, orig_args):
1535 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001536 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001537 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001538 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539 else:
1540 if self.GetBranch() is None:
1541 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1542
1543 # Default to diffing against common ancestor of upstream branch
1544 base_branch = self.GetCommonAncestorWithUpstream()
1545 git_diff_args = [base_branch, 'HEAD']
1546
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001547 # Fast best-effort checks to abort before running potentially expensive
1548 # hooks if uploading is likely to fail anyway. Passing these checks does
1549 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001550 self.EnsureAuthenticated(force=options.force)
1551 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001552
1553 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001554 watchlist = watchlists.Watchlists(settings.GetRoot())
1555 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001556 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001557 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558
Edward Lemur5a644f82020-03-18 16:44:57 +00001559 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001561 hook_results = self.RunHook(
1562 committing=False,
1563 may_prompt=not options.force,
1564 verbose=options.verbose,
1565 parallel=options.parallel,
1566 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001567 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001568 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001569 resultdb=options.resultdb,
1570 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001571 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001572
Aaron Gable13101a62018-02-09 13:20:41 -08001573 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001574 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001575 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001577 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001578 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 # Run post upload hooks, if specified.
1580 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001581 self.RunPostUploadHook(
1582 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583
1584 # Upload all dependencies if specified.
1585 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001586 print()
1587 print('--dependencies has been specified.')
1588 print('All dependent local branches will be re-uploaded.')
1589 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 # Remove the dependencies flag from args so that we do not end up in a
1591 # loop.
1592 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001593 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594 return ret
1595
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001596 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001597 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001598
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001599 Issue must have been already uploaded and known. Optionally allows for
1600 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001601 """
1602 assert new_state in _CQState.ALL_STATES
1603 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001604 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001605 vote_map = {
1606 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001607 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001608 _CQState.DRY_RUN: 1,
1609 _CQState.COMMIT: 2,
1610 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001611 if new_state == _CQState.QUICK_RUN:
1612 labels = {
1613 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1614 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1615 }
1616 else:
1617 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001618 notify = False if new_state == _CQState.DRY_RUN else None
1619 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001620 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001621 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001622 return 0
1623 except KeyboardInterrupt:
1624 raise
1625 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001626 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001627 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001628 ' * Your project has no CQ,\n'
1629 ' * You don\'t have permission to change the CQ state,\n'
1630 ' * There\'s a bug in this code (see stack trace below).\n'
1631 'Consider specifying which bots to trigger manually or asking your '
1632 'project owners for permissions or contacting Chrome Infra at:\n'
1633 'https://www.chromium.org/infra\n\n' %
1634 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001635 # Still raise exception so that stack trace is printed.
1636 raise
1637
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001638 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001639 # Lazy load of configs.
1640 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001641 if self._gerrit_host and '.' not in self._gerrit_host:
1642 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1643 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001644 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001645 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001646 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001647 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001648 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1649 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001650 return self._gerrit_host
1651
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001652 def _GetGitHost(self):
1653 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001654 remote_url = self.GetRemoteUrl()
1655 if not remote_url:
1656 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001657 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001658
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659 def GetCodereviewServer(self):
1660 if not self._gerrit_server:
1661 # If we're on a branch then get the server potentially associated
1662 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001663 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001664 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001665 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001666 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001667 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001668 if not self._gerrit_server:
1669 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1670 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001671 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001672 parts[0] = parts[0] + '-review'
1673 self._gerrit_host = '.'.join(parts)
1674 self._gerrit_server = 'https://%s' % self._gerrit_host
1675 return self._gerrit_server
1676
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001677 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001678 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001679 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001680 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001681 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001682 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001683 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001684 if project.endswith('.git'):
1685 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001686 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1687 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1688 # gitiles/git-over-https protocol. E.g.,
1689 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1690 # as
1691 # https://chromium.googlesource.com/v8/v8
1692 if project.startswith('a/'):
1693 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001694 return project
1695
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001696 def _GerritChangeIdentifier(self):
1697 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1698
1699 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001700 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001701 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001702 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001703 if project:
1704 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1705 # Fall back on still unique, but less efficient change number.
1706 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001707
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001708 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001709 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001710 if settings.GetGerritSkipEnsureAuthenticated():
1711 # For projects with unusual authentication schemes.
1712 # See http://crbug.com/603378.
1713 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001714
1715 # Check presence of cookies only if using cookies-based auth method.
1716 cookie_auth = gerrit_util.Authenticator.get()
1717 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001718 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001719
Florian Mayerae510e82020-01-30 21:04:48 +00001720 remote_url = self.GetRemoteUrl()
1721 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001722 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001723 return
1724 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001725 logging.warning('Ignoring branch %(branch)s with non-https remote '
1726 '%(remote)s', {
1727 'branch': self.branch,
1728 'remote': self.GetRemoteUrl()
1729 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001730 return
1731
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001732 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001733 self.GetCodereviewServer()
1734 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001735 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001736
1737 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1738 git_auth = cookie_auth.get_auth_header(git_host)
1739 if gerrit_auth and git_auth:
1740 if gerrit_auth == git_auth:
1741 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001742 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001743 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001744 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001745 ' %s\n'
1746 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001747 ' Consider running the following command:\n'
1748 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001749 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001750 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001751 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001752 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001753 cookie_auth.get_new_password_message(git_host)))
1754 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001755 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001756 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001757
1758 missing = (
1759 ([] if gerrit_auth else [self._gerrit_host]) +
1760 ([] if git_auth else [git_host]))
1761 DieWithError('Credentials for the following hosts are required:\n'
1762 ' %s\n'
1763 'These are read from %s (or legacy %s)\n'
1764 '%s' % (
1765 '\n '.join(missing),
1766 cookie_auth.get_gitcookies_path(),
1767 cookie_auth.get_netrc_path(),
1768 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001770 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001771 if not self.GetIssue():
1772 return
1773
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001774 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001775 if status == 'ABANDONED':
1776 DieWithError(
1777 'Change %s has been abandoned, new uploads are not allowed' %
1778 (self.GetIssueURL()))
1779 if status == 'MERGED':
1780 answer = gclient_utils.AskForData(
1781 'Change %s has been submitted, new uploads are not allowed. '
1782 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1783 ).lower()
1784 if answer not in ('y', ''):
1785 DieWithError('New uploads are not allowed.')
1786 self.SetIssue()
1787 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001788
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001789 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1790 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1791 # Apparently this check is not very important? Otherwise get_auth_email
1792 # could have been added to other implementations of Authenticator.
1793 cookies_auth = gerrit_util.Authenticator.get()
1794 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001795 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001796
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001797 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001798 if self.GetIssueOwner() == cookies_user:
1799 return
1800 logging.debug('change %s owner is %s, cookies user is %s',
1801 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001802 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001803 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001804 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001805 if details['email'] == self.GetIssueOwner():
1806 return
1807 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001808 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001809 'as %s.\n'
1810 'Uploading may fail due to lack of permissions.' %
1811 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1812 confirm_or_exit(action='upload')
1813
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001814 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001815 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001816 or CQ status, assuming adherence to a common workflow.
1817
1818 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 * 'error' - error from review tool (including deleted issues)
1820 * 'unsent' - no reviewers added
1821 * 'waiting' - waiting for review
1822 * 'reply' - waiting for uploader to reply to review
1823 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001824 * 'dry-run' - dry-running in the CQ
1825 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001826 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001827 """
1828 if not self.GetIssue():
1829 return None
1830
1831 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832 data = self._GetChangeDetail([
1833 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001834 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001835 return 'error'
1836
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001837 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838 return 'closed'
1839
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001840 cq_label = data['labels'].get('Commit-Queue', {})
1841 max_cq_vote = 0
1842 for vote in cq_label.get('all', []):
1843 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1844 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001845 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001846 if max_cq_vote == 1:
1847 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001848
Aaron Gable9ab38c62017-04-06 14:36:33 -07001849 if data['labels'].get('Code-Review', {}).get('approved'):
1850 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001851
1852 if not data.get('reviewers', {}).get('REVIEWER', []):
1853 return 'unsent'
1854
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001855 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001856 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001857 while messages:
1858 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001859 if (m.get('tag', '').startswith('autogenerated:cq') or
1860 m.get('tag', '').startswith('autogenerated:cv')):
1861 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001862 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001863 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001864 # Most recent message was by owner.
1865 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001866
1867 # Some reply from non-owner.
1868 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001869
1870 # Somehow there are no messages even though there are reviewers.
1871 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001872
1873 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001874 if not self.GetIssue():
1875 return None
1876
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001877 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001878 patchset = data['revisions'][data['current_revision']]['_number']
1879 self.SetPatchset(patchset)
1880 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001881
Gavin Make61ccc52020-11-13 00:12:57 +00001882 def GetMostRecentDryRunPatchset(self):
1883 """Get patchsets equivalent to the most recent patchset and return
1884 the patchset with the latest dry run. If none have been dry run, return
1885 the latest patchset."""
1886 if not self.GetIssue():
1887 return None
1888
1889 data = self._GetChangeDetail(['ALL_REVISIONS'])
1890 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001891 dry_run = {int(m['_revision_number'])
1892 for m in data.get('messages', [])
1893 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001894
1895 for revision_info in sorted(data.get('revisions', {}).values(),
1896 key=lambda c: c['_number'], reverse=True):
1897 if revision_info['_number'] in dry_run:
1898 patchset = revision_info['_number']
1899 break
1900 if revision_info.get('kind', '') not in \
1901 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1902 break
1903 self.SetPatchset(patchset)
1904 return patchset
1905
Aaron Gable636b13f2017-07-14 10:42:48 -07001906 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001907 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001908 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001909 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001910
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001911 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001912 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913 # CURRENT_REVISION is included to get the latest patchset so that
1914 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001915 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001916 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1917 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001918 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001919 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001920 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001921 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001922
1923 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001924 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001925 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001926 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001927 line_comments = file_comments.setdefault(path, [])
1928 line_comments.extend(
1929 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001930
1931 # Build dictionary of file comments for easy access and sorting later.
1932 # {author+date: {path: {patchset: {line: url+message}}}}
1933 comments = collections.defaultdict(
1934 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001935
1936 server = self.GetCodereviewServer()
1937 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1938 # /c/ is automatically added by short URL server.
1939 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1940 self.GetIssue())
1941 else:
1942 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1943
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001944 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001945 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001946 tag = comment.get('tag', '')
1947 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001948 continue
1949 key = (comment['author']['email'], comment['updated'])
1950 if comment.get('side', 'REVISION') == 'PARENT':
1951 patchset = 'Base'
1952 else:
1953 patchset = 'PS%d' % comment['patch_set']
1954 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001955 url = ('%s/%s/%s#%s%s' %
1956 (url_prefix, comment['patch_set'], path,
1957 'b' if comment.get('side') == 'PARENT' else '',
1958 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001959 comments[key][path][patchset][line] = (url, comment['message'])
1960
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001961 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001962 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001963 summary = self._BuildCommentSummary(msg, comments, readable)
1964 if summary:
1965 summaries.append(summary)
1966 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001967
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001968 @staticmethod
1969 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001970 if 'email' not in msg['author']:
1971 # Some bot accounts may not have an email associated.
1972 return None
1973
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001974 key = (msg['author']['email'], msg['date'])
1975 # Don't bother showing autogenerated messages that don't have associated
1976 # file or line comments. this will filter out most autogenerated
1977 # messages, but will keep robot comments like those from Tricium.
1978 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1979 if is_autogenerated and not comments.get(key):
1980 return None
1981 message = msg['message']
1982 # Gerrit spits out nanoseconds.
1983 assert len(msg['date'].split('.')[-1]) == 9
1984 date = datetime.datetime.strptime(msg['date'][:-3],
1985 '%Y-%m-%d %H:%M:%S.%f')
1986 if key in comments:
1987 message += '\n'
1988 for path, patchsets in sorted(comments.get(key, {}).items()):
1989 if readable:
1990 message += '\n%s' % path
1991 for patchset, lines in sorted(patchsets.items()):
1992 for line, (url, content) in sorted(lines.items()):
1993 if line:
1994 line_str = 'Line %d' % line
1995 path_str = '%s:%d:' % (path, line)
1996 else:
1997 line_str = 'File comment'
1998 path_str = '%s:0:' % path
1999 if readable:
2000 message += '\n %s, %s: %s' % (patchset, line_str, url)
2001 message += '\n %s\n' % content
2002 else:
2003 message += '\n%s ' % path_str
2004 message += '\n%s\n' % content
2005
2006 return _CommentSummary(
2007 date=date,
2008 message=message,
2009 sender=msg['author']['email'],
2010 autogenerated=is_autogenerated,
2011 # These could be inferred from the text messages and correlated with
2012 # Code-Review label maximum, however this is not reliable.
2013 # Leaving as is until the need arises.
2014 approval=False,
2015 disapproval=False,
2016 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002017
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002019 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002020 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002021
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002022 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002023 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002024 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002025
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002026 def _GetChangeDetail(self, options=None):
2027 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002028 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002029 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002030
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002031 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002032 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002033 options.append('CURRENT_COMMIT')
2034
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002035 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002036 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002037 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002038
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002039 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2040 # Assumption: data fetched before with extra options is suitable
2041 # for return for a smaller set of options.
2042 # For example, if we cached data for
2043 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2044 # and request is for options=[CURRENT_REVISION],
2045 # THEN we can return prior cached data.
2046 if options_set.issubset(cached_options_set):
2047 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002048
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002049 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002050 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002051 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002052 except gerrit_util.GerritError as e:
2053 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002054 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002055 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002056
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002057 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002058 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002059
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002060 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002061 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002062 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002063 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002064 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002065 except gerrit_util.GerritError as e:
2066 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002067 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002068 raise
agable32978d92016-11-01 12:55:02 -07002069 return data
2070
Karen Qian40c19422019-03-13 21:28:29 +00002071 def _IsCqConfigured(self):
2072 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002073 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002074
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002075 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002076 if git_common.is_dirty_git_tree('land'):
2077 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002078
tandriid60367b2016-06-22 05:25:12 -07002079 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002080 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002081 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002082 'which can test and land changes for you. '
2083 'Are you sure you wish to bypass it?\n',
2084 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002085 differs = True
tandriic4344b52016-08-29 06:04:54 -07002086 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002087 # Note: git diff outputs nothing if there is no diff.
2088 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002089 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002090 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002091 if detail['current_revision'] == last_upload:
2092 differs = False
2093 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002094 print('WARNING: Local branch contents differ from latest uploaded '
2095 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002096 if differs:
2097 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002098 confirm_or_exit(
2099 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2100 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002101 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002102 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002103 upstream = self.GetCommonAncestorWithUpstream()
2104 if self.GetIssue():
2105 description = self.FetchDescription()
2106 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002107 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002108 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002109 committing=True,
2110 may_prompt=not force,
2111 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002112 parallel=parallel,
2113 upstream=upstream,
2114 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002115 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002116 resultdb=resultdb,
2117 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002118
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002119 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002120 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002121 links = self._GetChangeCommit().get('web_links', [])
2122 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002123 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002124 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002125 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002126 return 0
2127
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002128 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2129 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 assert parsed_issue_arg.valid
2131
Edward Lemur125d60a2019-09-13 18:25:41 +00002132 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133
2134 if parsed_issue_arg.hostname:
2135 self._gerrit_host = parsed_issue_arg.hostname
2136 self._gerrit_server = 'https://%s' % self._gerrit_host
2137
tandriic2405f52016-10-10 08:13:15 -07002138 try:
2139 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002140 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002141 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142
2143 if not parsed_issue_arg.patchset:
2144 # Use current revision by default.
2145 revision_info = detail['revisions'][detail['current_revision']]
2146 patchset = int(revision_info['_number'])
2147 else:
2148 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002149 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2151 break
2152 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002153 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 (parsed_issue_arg.patchset, self.GetIssue()))
2155
Edward Lemur125d60a2019-09-13 18:25:41 +00002156 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002157 if remote_url.endswith('.git'):
2158 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002159 remote_url = remote_url.rstrip('/')
2160
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002162 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002163
2164 if remote_url != fetch_info['url']:
2165 DieWithError('Trying to patch a change from %s but this repo appears '
2166 'to be %s.' % (fetch_info['url'], remote_url))
2167
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002169
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002170 # If we have created a new branch then do the "set issue" immediately in
2171 # case the cherry-pick fails, which happens when resolving conflicts.
2172 if newbranch:
2173 self.SetIssue(parsed_issue_arg.issue)
2174
Aaron Gable62619a32017-06-16 08:22:09 -07002175 if force:
2176 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2177 print('Checked out commit for change %i patchset %i locally' %
2178 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002179 elif nocommit:
2180 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2181 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002182 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002183 RunGit(['cherry-pick', 'FETCH_HEAD'])
2184 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002185 (parsed_issue_arg.issue, patchset))
2186 print('Note: this created a local commit which does not have '
2187 'the same hash as the one uploaded for review. This will make '
2188 'uploading changes based on top of this branch difficult.\n'
2189 'If you want to do that, use "git cl patch --force" instead.')
2190
Stefan Zagerd08043c2017-10-12 12:07:02 -07002191 if self.GetBranch():
2192 self.SetIssue(parsed_issue_arg.issue)
2193 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002194 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002195 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2196 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2197 else:
2198 print('WARNING: You are in detached HEAD state.\n'
2199 'The patch has been applied to your checkout, but you will not be '
2200 'able to upload a new patch set to the gerrit issue.\n'
2201 'Try using the \'-b\' option if you would like to work on a '
2202 'branch and/or upload a new patch set.')
2203
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002204 return 0
2205
tandrii16e0b4e2016-06-07 10:34:28 -07002206 def _GerritCommitMsgHookCheck(self, offer_removal):
2207 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2208 if not os.path.exists(hook):
2209 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002210 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2211 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002212 data = gclient_utils.FileRead(hook)
2213 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2214 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002215 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002216 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002217 'and may interfere with it in subtle ways.\n'
2218 'We recommend you remove the commit-msg hook.')
2219 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002220 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002221 gclient_utils.rm_file_or_tree(hook)
2222 print('Gerrit commit-msg hook removed.')
2223 else:
2224 print('OK, will keep Gerrit commit-msg hook in place.')
2225
Edward Lemur1b52d872019-05-09 21:12:12 +00002226 def _CleanUpOldTraces(self):
2227 """Keep only the last |MAX_TRACES| traces."""
2228 try:
2229 traces = sorted([
2230 os.path.join(TRACES_DIR, f)
2231 for f in os.listdir(TRACES_DIR)
2232 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2233 and not f.startswith('tmp'))
2234 ])
2235 traces_to_delete = traces[:-MAX_TRACES]
2236 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002237 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002238 except OSError:
2239 print('WARNING: Failed to remove old git traces from\n'
2240 ' %s'
2241 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002242
Edward Lemur5737f022019-05-17 01:24:00 +00002243 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002244 """Zip and write the git push traces stored in traces_dir."""
2245 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002246 traces_zip = trace_name + '-traces'
2247 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002248 # Create a temporary dir to store git config and gitcookies in. It will be
2249 # compressed and stored next to the traces.
2250 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002251 git_info_zip = trace_name + '-git-info'
2252
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002253 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002254
Edward Lemur1b52d872019-05-09 21:12:12 +00002255 git_push_metadata['trace_name'] = trace_name
2256 gclient_utils.FileWrite(
2257 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2258
2259 # Keep only the first 6 characters of the git hashes on the packet
2260 # trace. This greatly decreases size after compression.
2261 packet_traces = os.path.join(traces_dir, 'trace-packet')
2262 if os.path.isfile(packet_traces):
2263 contents = gclient_utils.FileRead(packet_traces)
2264 gclient_utils.FileWrite(
2265 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2266 shutil.make_archive(traces_zip, 'zip', traces_dir)
2267
2268 # Collect and compress the git config and gitcookies.
2269 git_config = RunGit(['config', '-l'])
2270 gclient_utils.FileWrite(
2271 os.path.join(git_info_dir, 'git-config'),
2272 git_config)
2273
2274 cookie_auth = gerrit_util.Authenticator.get()
2275 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2276 gitcookies_path = cookie_auth.get_gitcookies_path()
2277 if os.path.isfile(gitcookies_path):
2278 gitcookies = gclient_utils.FileRead(gitcookies_path)
2279 gclient_utils.FileWrite(
2280 os.path.join(git_info_dir, 'gitcookies'),
2281 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2282 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2283
Edward Lemur1b52d872019-05-09 21:12:12 +00002284 gclient_utils.rmtree(git_info_dir)
2285
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002286 def _RunGitPushWithTraces(self,
2287 refspec,
2288 refspec_opts,
2289 git_push_metadata,
2290 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002291 """Run git push and collect the traces resulting from the execution."""
2292 # Create a temporary directory to store traces in. Traces will be compressed
2293 # and stored in a 'traces' dir inside depot_tools.
2294 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002295 trace_name = os.path.join(
2296 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002297
2298 env = os.environ.copy()
2299 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2300 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002301 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002302 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2303 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2304 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2305
2306 try:
2307 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002308 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002309 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002310 push_cmd = ['git', 'push', remote_url, refspec]
2311 if git_push_options:
2312 for opt in git_push_options:
2313 push_cmd.extend(['-o', opt])
2314
Edward Lemur0f58ae42019-04-30 17:24:12 +00002315 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002316 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002317 env=env,
2318 print_stdout=True,
2319 # Flush after every line: useful for seeing progress when running as
2320 # recipe.
2321 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002322 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002323 except subprocess2.CalledProcessError as e:
2324 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002325 if 'blocked keyword' in str(e.stdout):
2326 raise GitPushError(
2327 'Failed to create a change, very likely due to blocked keyword. '
2328 'Please examine output above for the reason of the failure.\n'
2329 'If this is a false positive, you can try to bypass blocked '
2330 'keyword by using push option '
2331 '-o uploadvalidator~skip, e.g.:\n'
2332 'git cl upload -o uploadvalidator~skip\n\n'
2333 'If git-cl is not working correctly, file a bug under the '
2334 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002335 if 'git push -o nokeycheck' in str(e.stdout):
2336 raise GitPushError(
2337 'Failed to create a change, very likely due to a private key being '
2338 'detected. Please examine output above for the reason of the '
2339 'failure.\n'
2340 'If this is a false positive, you can try to bypass private key '
2341 'detection by using push option '
2342 '-o nokeycheck, e.g.:\n'
2343 'git cl upload -o nokeycheck\n\n'
2344 'If git-cl is not working correctly, file a bug under the '
2345 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002346
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002347 raise GitPushError(
2348 'Failed to create a change. Please examine output above for the '
2349 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002350 'For emergencies, Googlers can escalate to '
2351 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002352 'Hint: run command below to diagnose common Git/Gerrit '
2353 'credential problems:\n'
2354 ' git cl creds-check\n'
2355 '\n'
2356 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2357 'component including the files below.\n'
2358 'Review the files before upload, since they might contain sensitive '
2359 'information.\n'
2360 'Set the Restrict-View-Google label so that they are not publicly '
2361 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002362 finally:
2363 execution_time = time_time() - before_push
2364 metrics.collector.add_repeated('sub_commands', {
2365 'command': 'git push',
2366 'execution_time': execution_time,
2367 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002368 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002369 })
2370
Edward Lemur1b52d872019-05-09 21:12:12 +00002371 git_push_metadata['execution_time'] = execution_time
2372 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002373 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002374
Edward Lemur1b52d872019-05-09 21:12:12 +00002375 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002376 gclient_utils.rmtree(traces_dir)
2377
2378 return push_stdout
2379
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002380 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2381 change_desc):
2382 """Upload the current branch to Gerrit, retry if new remote HEAD is
2383 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002384 remote, remote_branch = self.GetRemoteBranch()
2385 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2386
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002387 try:
2388 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002389 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002390 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002391 # Repository might be in the middle of transition to main branch as
2392 # default, and uploads to old default might be blocked.
2393 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002394 DieWithError(str(e), change_desc)
2395
Josip Sokcevicb631a882021-01-06 18:18:10 +00002396 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2397 self.GetGerritProject())
2398 if project_head == branch:
2399 DieWithError(str(e), change_desc)
2400 branch = project_head
2401
2402 print("WARNING: Fetching remote state and retrying upload to default "
2403 "branch...")
2404 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002405 options.edit_description = False
2406 options.force = True
2407 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002408 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2409 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002410 except GitPushError as e:
2411 DieWithError(str(e), change_desc)
2412
2413 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002414 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002416 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002417 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002418 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002419 # User requested to change description
2420 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002421 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002422 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002423 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002424 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002425 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002426 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002427 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002428 if len(change_ids) == 1:
2429 change_id = change_ids[0]
2430 else:
2431 change_id = GenerateGerritChangeId(change_desc.description)
2432 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002433
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002434 if options.preserve_tryjobs:
2435 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002436
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002437 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002438 parent = self._ComputeParent(
2439 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002440 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002441 with gclient_utils.temporary_file() as desc_tempfile:
2442 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2443 ref_to_push = RunGit(
2444 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002445 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002446 if options.no_add_changeid:
2447 pass
2448 else: # adding Change-Ids is okay.
2449 if not git_footers.get_footer_change_id(change_desc.description):
2450 DownloadGerritHook(False)
2451 change_desc.set_description(
2452 self._AddChangeIdToCommitMessage(change_desc.description,
2453 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002454 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002455 # For no-squash mode, we assume the remote called "origin" is the one we
2456 # want. It is not worthwhile to support different workflows for
2457 # no-squash mode.
2458 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002459 # attempt to extract the changeid from the current description
2460 # fail informatively if not possible.
2461 change_id_candidates = git_footers.get_footer_change_id(
2462 change_desc.description)
2463 if not change_id_candidates:
2464 DieWithError("Unable to extract change-id from message.")
2465 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002467 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002468 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2469 ref_to_push)]).splitlines()
2470 if len(commits) > 1:
2471 print('WARNING: This will upload %d commits. Run the following command '
2472 'to see which commits will be uploaded: ' % len(commits))
2473 print('git log %s..%s' % (parent, ref_to_push))
2474 print('You can also use `git squash-branch` to squash these into a '
2475 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002476 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002477
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002478 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002479 cc = []
2480 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2481 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2482 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002483 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002484 if len(cc) > 100:
2485 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2486 'process/lsc/lsc_workflow.md')
2487 print('WARNING: This will auto-CC %s users.' % len(cc))
2488 print('LSC may be more appropriate: %s' % lsc)
2489 print('You can also use the --no-autocc flag to disable auto-CC.')
2490 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002491 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002492 if options.cc:
2493 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002494 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002495 if change_desc.get_cced():
2496 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002497 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002498 valid_accounts = set(reviewers + cc)
2499 # TODO(crbug/877717): relax this for all hosts.
2500 else:
2501 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002502 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002503 logging.info('accounts %s are recognized, %s invalid',
2504 sorted(valid_accounts),
2505 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002506
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002507 # Extra options that can be specified at push time. Doc:
2508 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002509 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002510
Aaron Gable844cf292017-06-28 11:32:59 -07002511 # By default, new changes are started in WIP mode, and subsequent patchsets
2512 # don't send email. At any time, passing --send-mail will mark the change
2513 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002514 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002515 refspec_opts.append('ready')
2516 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002517 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002518 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002519 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002520 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002521
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002522 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002523 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002524
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002525 # Set options.title in case user was prompted in _GetTitleForUpload and
2526 # _CMDUploadChange needs to be called again.
2527 options.title = self._GetTitleForUpload(options)
2528 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002529 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002530 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002531 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002532
agablec6787972016-09-09 16:13:34 -07002533 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002534 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002535
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002536 for r in sorted(reviewers):
2537 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002538 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002539 reviewers.remove(r)
2540 else:
2541 # TODO(tandrii): this should probably be a hard failure.
2542 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2543 % r)
2544 for c in sorted(cc):
2545 # refspec option will be rejected if cc doesn't correspond to an
2546 # account, even though REST call to add such arbitrary cc may succeed.
2547 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002548 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002549 cc.remove(c)
2550
rmistry9eadede2016-09-19 11:22:43 -07002551 if options.topic:
2552 # Documentation on Gerrit topics is here:
2553 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002554 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002555
Edward Lemur687ca902018-12-05 02:30:30 +00002556 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002557 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002558 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002559 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002560 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002561 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002562 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002563 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002564 elif options.cq_quick_run:
2565 refspec_opts.append('l=Commit-Queue+1')
2566 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002567
2568 if change_desc.get_reviewers(tbr_only=True):
2569 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002570 self.GetGerritHost(),
2571 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002572 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002573
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002574 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002575 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002576 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002577 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002578 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2579
2580 refspec_suffix = ''
2581 if refspec_opts:
2582 refspec_suffix = '%' + ','.join(refspec_opts)
2583 assert ' ' not in refspec_suffix, (
2584 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2585 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002586
Edward Lemur1b52d872019-05-09 21:12:12 +00002587 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002588 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002589 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002590 'change_id': change_id,
2591 'description': change_desc.description,
2592 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002593
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002594 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002595 git_push_metadata,
2596 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002597
2598 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002599 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002600 change_numbers = [m.group(1)
2601 for m in map(regex.match, push_stdout.splitlines())
2602 if m]
2603 if len(change_numbers) != 1:
2604 DieWithError(
2605 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002606 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002607 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002608 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002609
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002610 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002611 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002612 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002613 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002614 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002615 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002616 reviewers, cc,
2617 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002618
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619 return 0
2620
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002621 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2622 change_desc):
2623 """Computes parent of the generated commit to be uploaded to Gerrit.
2624
2625 Returns revision or a ref name.
2626 """
2627 if custom_cl_base:
2628 # Try to avoid creating additional unintended CLs when uploading, unless
2629 # user wants to take this risk.
2630 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2631 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2632 local_ref_of_target_remote])
2633 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002634 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002635 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2636 'If you proceed with upload, more than 1 CL may be created by '
2637 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2638 'If you are certain that specified base `%s` has already been '
2639 'uploaded to Gerrit as another CL, you may proceed.\n' %
2640 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2641 if not force:
2642 confirm_or_exit(
2643 'Do you take responsibility for cleaning up potential mess '
2644 'resulting from proceeding with upload?',
2645 action='upload')
2646 return custom_cl_base
2647
Aaron Gablef97e33d2017-03-30 15:44:27 -07002648 if remote != '.':
2649 return self.GetCommonAncestorWithUpstream()
2650
2651 # If our upstream branch is local, we base our squashed commit on its
2652 # squashed version.
2653 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2654
Aaron Gablef97e33d2017-03-30 15:44:27 -07002655 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002656 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002657 if upstream_branch_name == 'main':
2658 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002659
2660 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002661 # TODO(tandrii): consider checking parent change in Gerrit and using its
2662 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2663 # the tree hash of the parent branch. The upside is less likely bogus
2664 # requests to reupload parent change just because it's uploadhash is
2665 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002666 parent = scm.GIT.GetBranchConfig(
2667 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002668 # Verify that the upstream branch has been uploaded too, otherwise
2669 # Gerrit will create additional CLs when uploading.
2670 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2671 RunGitSilent(['rev-parse', parent + ':'])):
2672 DieWithError(
2673 '\nUpload upstream branch %s first.\n'
2674 'It is likely that this branch has been rebased since its last '
2675 'upload, so you just need to upload it again.\n'
2676 '(If you uploaded it with --no-squash, then branch dependencies '
2677 'are not supported, and you should reupload with --squash.)'
2678 % upstream_branch_name,
2679 change_desc)
2680 return parent
2681
Edward Lemura12175c2020-03-09 16:58:26 +00002682 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002683 """Re-commits using the current message, assumes the commit hook is in
2684 place.
2685 """
Edward Lemura12175c2020-03-09 16:58:26 +00002686 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002687 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002688 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002689 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002690 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002691
2692 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002693
tandriie113dfd2016-10-11 10:20:12 -07002694 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002695 try:
2696 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002697 except GerritChangeNotExists:
2698 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002699
2700 if data['status'] in ('ABANDONED', 'MERGED'):
2701 return 'CL %s is closed' % self.GetIssue()
2702
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002703 def GetGerritChange(self, patchset=None):
2704 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002705 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002706 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002707 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002708 data = self._GetChangeDetail(['ALL_REVISIONS'])
2709
2710 assert host and issue and patchset, 'CL must be uploaded first'
2711
2712 has_patchset = any(
2713 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002714 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002715 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002716 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002717 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002718
tandrii8c5a3532016-11-04 07:52:02 -07002719 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002720 'host': host,
2721 'change': issue,
2722 'project': data['project'],
2723 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002724 }
tandriie113dfd2016-10-11 10:20:12 -07002725
tandriide281ae2016-10-12 06:02:30 -07002726 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002727 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002728
Edward Lemur707d70b2018-02-07 00:50:14 +01002729 def GetReviewers(self):
2730 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002731 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002732
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002733
Lei Zhang8a0efc12020-08-05 19:58:45 +00002734def _get_bug_line_values(default_project_prefix, bugs):
2735 """Given default_project_prefix and comma separated list of bugs, yields bug
2736 line values.
tandriif9aefb72016-07-01 09:06:51 -07002737
2738 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002739 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002740 * string, which is left as is.
2741
2742 This function may produce more than one line, because bugdroid expects one
2743 project per line.
2744
Lei Zhang8a0efc12020-08-05 19:58:45 +00002745 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002746 ['v8:123', 'chromium:789']
2747 """
2748 default_bugs = []
2749 others = []
2750 for bug in bugs.split(','):
2751 bug = bug.strip()
2752 if bug:
2753 try:
2754 default_bugs.append(int(bug))
2755 except ValueError:
2756 others.append(bug)
2757
2758 if default_bugs:
2759 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002760 if default_project_prefix:
2761 if not default_project_prefix.endswith(':'):
2762 default_project_prefix += ':'
2763 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002764 else:
2765 yield default_bugs
2766 for other in sorted(others):
2767 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2768 yield other
2769
2770
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002771class ChangeDescription(object):
2772 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002773 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002774 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002775 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002776 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002777 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002778 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2779 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002780 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002781 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002782
Dan Beamd8b04ca2019-10-10 21:23:26 +00002783 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002784 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002785 if bug:
2786 regexp = re.compile(self.BUG_LINE)
2787 prefix = settings.GetBugPrefix()
2788 if not any((regexp.match(line) for line in self._description_lines)):
2789 values = list(_get_bug_line_values(prefix, bug))
2790 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002791 if fixed:
2792 regexp = re.compile(self.FIXED_LINE)
2793 prefix = settings.GetBugPrefix()
2794 if not any((regexp.match(line) for line in self._description_lines)):
2795 values = list(_get_bug_line_values(prefix, fixed))
2796 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002797
agable@chromium.org42c20792013-09-12 17:34:49 +00002798 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002799 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 return '\n'.join(self._description_lines)
2801
2802 def set_description(self, desc):
2803 if isinstance(desc, basestring):
2804 lines = desc.splitlines()
2805 else:
2806 lines = [line.rstrip() for line in desc]
2807 while lines and not lines[0]:
2808 lines.pop(0)
2809 while lines and not lines[-1]:
2810 lines.pop(-1)
2811 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002812
Edward Lemur5a644f82020-03-18 16:44:57 +00002813 def ensure_change_id(self, change_id):
2814 description = self.description
2815 footer_change_ids = git_footers.get_footer_change_id(description)
2816 # Make sure that the Change-Id in the description matches the given one.
2817 if footer_change_ids != [change_id]:
2818 if footer_change_ids:
2819 # Remove any existing Change-Id footers since they don't match the
2820 # expected change_id footer.
2821 description = git_footers.remove_footer(description, 'Change-Id')
2822 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2823 'if you want to set a new one.')
2824 # Add the expected Change-Id footer.
2825 description = git_footers.add_footer_change_id(description, change_id)
2826 self.set_description(description)
2827
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002828 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002829 """Rewrites the R=/TBR= line(s) as a single line each.
2830
2831 Args:
2832 reviewers (list(str)) - list of additional emails to use for reviewers.
2833 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002834 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002835 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002836 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002837
2838 reviewers = set(reviewers)
2839 tbrs = set(tbrs)
2840 LOOKUP = {
2841 'TBR': tbrs,
2842 'R': reviewers,
2843 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002844
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002845 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002846 regexp = re.compile(self.R_LINE)
2847 matches = [regexp.match(line) for line in self._description_lines]
2848 new_desc = [l for i, l in enumerate(self._description_lines)
2849 if not matches[i]]
2850 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002851
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002853
2854 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002855 for match in matches:
2856 if not match:
2857 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002858 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2859
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002860 # If any folks ended up in both groups, remove them from tbrs.
2861 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002862
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002863 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2864 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002865
2866 # Put the new lines in the description where the old first R= line was.
2867 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2868 if 0 <= line_loc < len(self._description_lines):
2869 if new_tbr_line:
2870 self._description_lines.insert(line_loc, new_tbr_line)
2871 if new_r_line:
2872 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002873 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002874 if new_r_line:
2875 self.append_footer(new_r_line)
2876 if new_tbr_line:
2877 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002878
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002879 def set_preserve_tryjobs(self):
2880 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2881 footers = git_footers.parse_footers(self.description)
2882 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2883 if v.lower() == 'true':
2884 return
2885 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2886
Anthony Polito8b955342019-09-24 19:01:36 +00002887 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002888 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002889 self.set_description([
2890 '# Enter a description of the change.',
2891 '# This will be displayed on the codereview site.',
2892 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002893 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002894 '--------------------',
2895 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002896 bug_regexp = re.compile(self.BUG_LINE)
2897 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002898 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002899 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002900
Dan Beamd8b04ca2019-10-10 21:23:26 +00002901 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002902 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002903
Bruce Dawsonfc487042020-10-27 19:11:37 +00002904 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002905 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002906 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002907 if not content:
2908 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002909 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002910
Bruce Dawson2377b012018-01-11 16:46:49 -08002911 # Strip off comments and default inserted "Bug:" line.
2912 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002913 (line.startswith('#') or
2914 line.rstrip() == "Bug:" or
2915 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002916 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002917 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002918 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002919
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002920 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002921 """Adds a footer line to the description.
2922
2923 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2924 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2925 that Gerrit footers are always at the end.
2926 """
2927 parsed_footer_line = git_footers.parse_footer(line)
2928 if parsed_footer_line:
2929 # Line is a gerrit footer in the form: Footer-Key: any value.
2930 # Thus, must be appended observing Gerrit footer rules.
2931 self.set_description(
2932 git_footers.add_footer(self.description,
2933 key=parsed_footer_line[0],
2934 value=parsed_footer_line[1]))
2935 return
2936
2937 if not self._description_lines:
2938 self._description_lines.append(line)
2939 return
2940
2941 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2942 if gerrit_footers:
2943 # git_footers.split_footers ensures that there is an empty line before
2944 # actual (gerrit) footers, if any. We have to keep it that way.
2945 assert top_lines and top_lines[-1] == ''
2946 top_lines, separator = top_lines[:-1], top_lines[-1:]
2947 else:
2948 separator = [] # No need for separator if there are no gerrit_footers.
2949
2950 prev_line = top_lines[-1] if top_lines else ''
2951 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2952 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2953 top_lines.append('')
2954 top_lines.append(line)
2955 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002956
tandrii99a72f22016-08-17 14:33:24 -07002957 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002958 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002959 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002960 reviewers = [match.group(2).strip()
2961 for match in matches
2962 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002963 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002964
bradnelsond975b302016-10-23 12:20:23 -07002965 def get_cced(self):
2966 """Retrieves the list of reviewers."""
2967 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2968 cced = [match.group(2).strip() for match in matches if match]
2969 return cleanup_list(cced)
2970
Nodir Turakulov23b82142017-11-16 11:04:25 -08002971 def get_hash_tags(self):
2972 """Extracts and sanitizes a list of Gerrit hashtags."""
2973 subject = (self._description_lines or ('',))[0]
2974 subject = re.sub(
2975 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2976
2977 tags = []
2978 start = 0
2979 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2980 while True:
2981 m = bracket_exp.match(subject, start)
2982 if not m:
2983 break
2984 tags.append(self.sanitize_hash_tag(m.group(1)))
2985 start = m.end()
2986
2987 if not tags:
2988 # Try "Tag: " prefix.
2989 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2990 if m:
2991 tags.append(self.sanitize_hash_tag(m.group(1)))
2992 return tags
2993
2994 @classmethod
2995 def sanitize_hash_tag(cls, tag):
2996 """Returns a sanitized Gerrit hash tag.
2997
2998 A sanitized hashtag can be used as a git push refspec parameter value.
2999 """
3000 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3001
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003002
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003003def FindCodereviewSettingsFile(filename='codereview.settings'):
3004 """Finds the given file starting in the cwd and going up.
3005
3006 Only looks up to the top of the repository unless an
3007 'inherit-review-settings-ok' file exists in the root of the repository.
3008 """
3009 inherit_ok_file = 'inherit-review-settings-ok'
3010 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003011 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003012 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003013 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003014 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003015 if os.path.isfile(os.path.join(cwd, filename)):
3016 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003017 if cwd == root:
3018 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003019 parent_dir = os.path.dirname(cwd)
3020 if parent_dir == cwd:
3021 # We hit the system root directory.
3022 break
3023 cwd = parent_dir
3024 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003025
3026
3027def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003028 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003029 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003031 def SetProperty(name, setting, unset_error_ok=False):
3032 fullname = 'rietveld.' + name
3033 if setting in keyvals:
3034 RunGit(['config', fullname, keyvals[setting]])
3035 else:
3036 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3037
tandrii48df5812016-10-17 03:55:37 -07003038 if not keyvals.get('GERRIT_HOST', False):
3039 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003040 # Only server setting is required. Other settings can be absent.
3041 # In that case, we ignore errors raised during option deletion attempt.
3042 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3043 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3044 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003045 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003046 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3047 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003048 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3049 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003050 SetProperty(
3051 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003052 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003053
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003054 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003055 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003056
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003057 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003058 RunGit(['config', 'gerrit.squash-uploads',
3059 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003060
tandrii@chromium.org28253532016-04-14 13:46:56 +00003061 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003062 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003063 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3064
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003065 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003066 # should be of the form
3067 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3068 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003069 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3070 keyvals['ORIGIN_URL_CONFIG']])
3071
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003072
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003073def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003074 """Downloads a network object to a local file, like urllib.urlretrieve.
3075
3076 This is necessary because urllib is broken for SSL connections via a proxy.
3077 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003078 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003079 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003080
3081
ukai@chromium.org712d6102013-11-27 00:52:58 +00003082def hasSheBang(fname):
3083 """Checks fname is a #! script."""
3084 with open(fname) as f:
3085 return f.read(2).startswith('#!')
3086
3087
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003088def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003089 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003090
3091 Args:
3092 force: True to update hooks. False to install hooks if not present.
3093 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003094 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003095 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3096 if not os.access(dst, os.X_OK):
3097 if os.path.exists(dst):
3098 if not force:
3099 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003100 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003101 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003102 if not hasSheBang(dst):
3103 DieWithError('Not a script: %s\n'
3104 'You need to download from\n%s\n'
3105 'into .git/hooks/commit-msg and '
3106 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003107 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3108 except Exception:
3109 if os.path.exists(dst):
3110 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003111 DieWithError('\nFailed to download hooks.\n'
3112 'You need to download from\n%s\n'
3113 'into .git/hooks/commit-msg and '
3114 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003115
3116
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003117class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003118 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003119
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003120 _GOOGLESOURCE = 'googlesource.com'
3121
3122 def __init__(self):
3123 # Cached list of [host, identity, source], where source is either
3124 # .gitcookies or .netrc.
3125 self._all_hosts = None
3126
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003127 def ensure_configured_gitcookies(self):
3128 """Runs checks and suggests fixes to make git use .gitcookies from default
3129 path."""
3130 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3131 configured_path = RunGitSilent(
3132 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003133 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003134 if configured_path:
3135 self._ensure_default_gitcookies_path(configured_path, default)
3136 else:
3137 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003138
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003139 @staticmethod
3140 def _ensure_default_gitcookies_path(configured_path, default_path):
3141 assert configured_path
3142 if configured_path == default_path:
3143 print('git is already configured to use your .gitcookies from %s' %
3144 configured_path)
3145 return
3146
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003147 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003148 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3149 (configured_path, default_path))
3150
3151 if not os.path.exists(configured_path):
3152 print('However, your configured .gitcookies file is missing.')
3153 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3154 action='reconfigure')
3155 RunGit(['config', '--global', 'http.cookiefile', default_path])
3156 return
3157
3158 if os.path.exists(default_path):
3159 print('WARNING: default .gitcookies file already exists %s' %
3160 default_path)
3161 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3162 default_path)
3163
3164 confirm_or_exit('Move existing .gitcookies to default location?',
3165 action='move')
3166 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003167 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003168 print('Moved and reconfigured git to use .gitcookies from %s' %
3169 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003170
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003171 @staticmethod
3172 def _configure_gitcookies_path(default_path):
3173 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3174 if os.path.exists(netrc_path):
3175 print('You seem to be using outdated .netrc for git credentials: %s' %
3176 netrc_path)
3177 print('This tool will guide you through setting up recommended '
3178 '.gitcookies store for git credentials.\n'
3179 '\n'
3180 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3181 ' git config --global --unset http.cookiefile\n'
3182 ' mv %s %s.backup\n\n' % (default_path, default_path))
3183 confirm_or_exit(action='setup .gitcookies')
3184 RunGit(['config', '--global', 'http.cookiefile', default_path])
3185 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003186
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003187 def get_hosts_with_creds(self, include_netrc=False):
3188 if self._all_hosts is None:
3189 a = gerrit_util.CookiesAuthenticator()
3190 self._all_hosts = [
3191 (h, u, s)
3192 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003193 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3194 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003195 )
3196 if h.endswith(self._GOOGLESOURCE)
3197 ]
3198
3199 if include_netrc:
3200 return self._all_hosts
3201 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3202
3203 def print_current_creds(self, include_netrc=False):
3204 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3205 if not hosts:
3206 print('No Git/Gerrit credentials found')
3207 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003208 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003209 header = [('Host', 'User', 'Which file'),
3210 ['=' * l for l in lengths]]
3211 for row in (header + hosts):
3212 print('\t'.join((('%%+%ds' % l) % s)
3213 for l, s in zip(lengths, row)))
3214
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003215 @staticmethod
3216 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003217 """Parses identity "git-<username>.domain" into <username> and domain."""
3218 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003219 # distinguishable from sub-domains. But we do know typical domains:
3220 if identity.endswith('.chromium.org'):
3221 domain = 'chromium.org'
3222 username = identity[:-len('.chromium.org')]
3223 else:
3224 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003225 if username.startswith('git-'):
3226 username = username[len('git-'):]
3227 return username, domain
3228
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003229 def _canonical_git_googlesource_host(self, host):
3230 """Normalizes Gerrit hosts (with '-review') to Git host."""
3231 assert host.endswith(self._GOOGLESOURCE)
3232 # Prefix doesn't include '.' at the end.
3233 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3234 if prefix.endswith('-review'):
3235 prefix = prefix[:-len('-review')]
3236 return prefix + '.' + self._GOOGLESOURCE
3237
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003238 def _canonical_gerrit_googlesource_host(self, host):
3239 git_host = self._canonical_git_googlesource_host(host)
3240 prefix = git_host.split('.', 1)[0]
3241 return prefix + '-review.' + self._GOOGLESOURCE
3242
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003243 def _get_counterpart_host(self, host):
3244 assert host.endswith(self._GOOGLESOURCE)
3245 git = self._canonical_git_googlesource_host(host)
3246 gerrit = self._canonical_gerrit_googlesource_host(git)
3247 return git if gerrit == host else gerrit
3248
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003249 def has_generic_host(self):
3250 """Returns whether generic .googlesource.com has been configured.
3251
3252 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3253 """
3254 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3255 if host == '.' + self._GOOGLESOURCE:
3256 return True
3257 return False
3258
3259 def _get_git_gerrit_identity_pairs(self):
3260 """Returns map from canonic host to pair of identities (Git, Gerrit).
3261
3262 One of identities might be None, meaning not configured.
3263 """
3264 host_to_identity_pairs = {}
3265 for host, identity, _ in self.get_hosts_with_creds():
3266 canonical = self._canonical_git_googlesource_host(host)
3267 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3268 idx = 0 if canonical == host else 1
3269 pair[idx] = identity
3270 return host_to_identity_pairs
3271
3272 def get_partially_configured_hosts(self):
3273 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003274 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003275 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003276 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003277
3278 def get_conflicting_hosts(self):
3279 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003281 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003282 if None not in (i1, i2) and i1 != i2)
3283
3284 def get_duplicated_hosts(self):
3285 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003286 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003287
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003288
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003290 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003291 hosts = sorted(hosts)
3292 assert hosts
3293 if extra_column_func is None:
3294 extras = [''] * len(hosts)
3295 else:
3296 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003297 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3298 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003299 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003300 lines.append(tmpl % he)
3301 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003303 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003304 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003305 yield ('.googlesource.com wildcard record detected',
3306 ['Chrome Infrastructure team recommends to list full host names '
3307 'explicitly.'],
3308 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003309
3310 dups = self.get_duplicated_hosts()
3311 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003312 yield ('The following hosts were defined twice',
3313 self._format_hosts(dups),
3314 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003315
3316 partial = self.get_partially_configured_hosts()
3317 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003318 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3319 'These hosts are missing',
3320 self._format_hosts(partial, lambda host: 'but %s defined' %
3321 self._get_counterpart_host(host)),
3322 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003323
3324 conflicting = self.get_conflicting_hosts()
3325 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003326 yield ('The following Git hosts have differing credentials from their '
3327 'Gerrit counterparts',
3328 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3329 tuple(self._get_git_gerrit_identity_pairs()[host])),
3330 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003331
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003332 def find_and_report_problems(self):
3333 """Returns True if there was at least one problem, else False."""
3334 found = False
3335 bad_hosts = set()
3336 for title, sublines, hosts in self._find_problems():
3337 if not found:
3338 found = True
3339 print('\n\n.gitcookies problem report:\n')
3340 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003341 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003342 if sublines:
3343 print()
3344 print(' %s' % '\n '.join(sublines))
3345 print()
3346
3347 if bad_hosts:
3348 assert found
3349 print(' You can manually remove corresponding lines in your %s file and '
3350 'visit the following URLs with correct account to generate '
3351 'correct credential lines:\n' %
3352 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3353 print(' %s' % '\n '.join(sorted(set(
3354 gerrit_util.CookiesAuthenticator().get_new_password_url(
3355 self._canonical_git_googlesource_host(host))
3356 for host in bad_hosts
3357 ))))
3358 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003359
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003360
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003361@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003362def CMDcreds_check(parser, args):
3363 """Checks credentials and suggests changes."""
3364 _, _ = parser.parse_args(args)
3365
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003366 # Code below checks .gitcookies. Abort if using something else.
3367 authn = gerrit_util.Authenticator.get()
3368 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003369 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003370 'This command is not designed for bot environment. It checks '
3371 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003372 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3373 if isinstance(authn, gerrit_util.GceAuthenticator):
3374 message += (
3375 '\n'
3376 'If you need to run this on GCE or a cloudtop instance, '
3377 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3378 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003379
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003380 checker = _GitCookiesChecker()
3381 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003382
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003383 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003384 checker.print_current_creds(include_netrc=True)
3385
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003386 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003387 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003388 return 0
3389 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003390
3391
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003392@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003393def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003394 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003395 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003396 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003397 _, args = parser.parse_args(args)
3398 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003399 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003400 return RunGit(['config', 'branch.%s.base-url' % branch],
3401 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003402
3403 print('Setting base-url to %s' % args[0])
3404 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3405 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003406
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003407
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003408def color_for_status(status):
3409 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003410 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003411 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003412 'unsent': BOLD + Fore.YELLOW,
3413 'waiting': BOLD + Fore.RED,
3414 'reply': BOLD + Fore.YELLOW,
3415 'not lgtm': BOLD + Fore.RED,
3416 'lgtm': BOLD + Fore.GREEN,
3417 'commit': BOLD + Fore.MAGENTA,
3418 'closed': BOLD + Fore.CYAN,
3419 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003420 }.get(status, Fore.WHITE)
3421
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003422
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003423def get_cl_statuses(changes, fine_grained, max_processes=None):
3424 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003425
3426 If fine_grained is true, this will fetch CL statuses from the server.
3427 Otherwise, simply indicate if there's a matching url for the given branches.
3428
3429 If max_processes is specified, it is used as the maximum number of processes
3430 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3431 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003432
3433 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003434 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003435 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003436 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003437
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003438 if not fine_grained:
3439 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003440 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003441 for cl in changes:
3442 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003443 return
3444
3445 # First, sort out authentication issues.
3446 logging.debug('ensuring credentials exist')
3447 for cl in changes:
3448 cl.EnsureAuthenticated(force=False, refresh=True)
3449
3450 def fetch(cl):
3451 try:
3452 return (cl, cl.GetStatus())
3453 except:
3454 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003455 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003456 raise
3457
3458 threads_count = len(changes)
3459 if max_processes:
3460 threads_count = max(1, min(threads_count, max_processes))
3461 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3462
Edward Lemur61bf4172020-02-24 23:22:37 +00003463 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003464 fetched_cls = set()
3465 try:
3466 it = pool.imap_unordered(fetch, changes).__iter__()
3467 while True:
3468 try:
3469 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003470 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003471 break
3472 fetched_cls.add(cl)
3473 yield cl, status
3474 finally:
3475 pool.close()
3476
3477 # Add any branches that failed to fetch.
3478 for cl in set(changes) - fetched_cls:
3479 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003480
rmistry@google.com2dd99862015-06-22 12:22:18 +00003481
Jose Lopes3863fc52020-04-07 17:00:25 +00003482def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003483 """Uploads CLs of local branches that are dependents of the current branch.
3484
3485 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003486
3487 test1 -> test2.1 -> test3.1
3488 -> test3.2
3489 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003490
3491 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3492 run on the dependent branches in this order:
3493 test2.1, test3.1, test3.2, test2.2, test3.3
3494
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003495 Note: This function does not rebase your local dependent branches. Use it
3496 when you make a change to the parent branch that will not conflict
3497 with its dependent branches, and you would like their dependencies
3498 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003499 """
3500 if git_common.is_dirty_git_tree('upload-branch-deps'):
3501 return 1
3502
3503 root_branch = cl.GetBranch()
3504 if root_branch is None:
3505 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3506 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003507 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003508 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3509 'patchset dependencies without an uploaded CL.')
3510
3511 branches = RunGit(['for-each-ref',
3512 '--format=%(refname:short) %(upstream:short)',
3513 'refs/heads'])
3514 if not branches:
3515 print('No local branches found.')
3516 return 0
3517
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003518 # Create a dictionary of all local branches to the branches that are
3519 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 tracked_to_dependents = collections.defaultdict(list)
3521 for b in branches.splitlines():
3522 tokens = b.split()
3523 if len(tokens) == 2:
3524 branch_name, tracked = tokens
3525 tracked_to_dependents[tracked].append(branch_name)
3526
vapiera7fbd5a2016-06-16 09:17:49 -07003527 print()
3528 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003529 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003530
rmistry@google.com2dd99862015-06-22 12:22:18 +00003531 def traverse_dependents_preorder(branch, padding=''):
3532 dependents_to_process = tracked_to_dependents.get(branch, [])
3533 padding += ' '
3534 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003535 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003536 dependents.append(dependent)
3537 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003538
rmistry@google.com2dd99862015-06-22 12:22:18 +00003539 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003540 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541
3542 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003543 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003544 return 0
3545
Jose Lopes3863fc52020-04-07 17:00:25 +00003546 if not force:
3547 confirm_or_exit('This command will checkout all dependent branches and run '
3548 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003549
rmistry@google.com2dd99862015-06-22 12:22:18 +00003550 # Record all dependents that failed to upload.
3551 failures = {}
3552 # Go through all dependents, checkout the branch and upload.
3553 try:
3554 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003555 print()
3556 print('--------------------------------------')
3557 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003558 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 try:
3561 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003563 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003564 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003565 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003567 finally:
3568 # Swap back to the original root branch.
3569 RunGit(['checkout', '-q', root_branch])
3570
vapiera7fbd5a2016-06-16 09:17:49 -07003571 print()
3572 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003573 for dependent_branch in dependents:
3574 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003575 print(' %s : %s' % (dependent_branch, upload_status))
3576 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003577
3578 return 0
3579
3580
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003581def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003582 """Given a proposed tag name, returns a tag name that is guaranteed to be
3583 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3584 or 'foo-3', and so on."""
3585
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003586 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003587 for suffix_num in itertools.count(1):
3588 if suffix_num == 1:
3589 to_check = proposed_tag
3590 else:
3591 to_check = '%s-%d' % (proposed_tag, suffix_num)
3592
3593 if to_check not in existing_tags:
3594 return to_check
3595
3596
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003597@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003598def CMDarchive(parser, args):
3599 """Archives and deletes branches associated with closed changelists."""
3600 parser.add_option(
3601 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003602 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003603 parser.add_option(
3604 '-f', '--force', action='store_true',
3605 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003606 parser.add_option(
3607 '-d', '--dry-run', action='store_true',
3608 help='Skip the branch tagging and removal steps.')
3609 parser.add_option(
3610 '-t', '--notags', action='store_true',
3611 help='Do not tag archived branches. '
3612 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003613 parser.add_option(
3614 '-p',
3615 '--pattern',
3616 default='git-cl-archived-{issue}-{branch}',
3617 help='Format string for archive tags. '
3618 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003619
kmarshall3bff56b2016-06-06 18:31:47 -07003620 options, args = parser.parse_args(args)
3621 if args:
3622 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003623
3624 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3625 if not branches:
3626 return 0
3627
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003628 tags = RunGit(['for-each-ref', '--format=%(refname)',
3629 'refs/tags']).splitlines() or []
3630 tags = [t.split('/')[-1] for t in tags]
3631
vapiera7fbd5a2016-06-16 09:17:49 -07003632 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003633 changes = [Changelist(branchref=b)
3634 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003635 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3636 statuses = get_cl_statuses(changes,
3637 fine_grained=True,
3638 max_processes=options.maxjobs)
3639 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003640 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3641 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003642 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003643 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003644 proposal.sort()
3645
3646 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003647 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003648 return 0
3649
Edward Lemur85153282020-02-14 22:06:29 +00003650 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003651
vapiera7fbd5a2016-06-16 09:17:49 -07003652 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003653 if options.notags:
3654 for next_item in proposal:
3655 print(' ' + next_item[0])
3656 else:
3657 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3658 for next_item in proposal:
3659 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003660
kmarshall9249e012016-08-23 12:02:16 -07003661 # Quit now on precondition failure or if instructed by the user, either
3662 # via an interactive prompt or by command line flags.
3663 if options.dry_run:
3664 print('\nNo changes were made (dry run).\n')
3665 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003666
3667 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003668 print('You are currently on a branch \'%s\' which is associated with a '
3669 'closed codereview issue, so archive cannot proceed. Please '
3670 'checkout another branch and run this command again.' %
3671 current_branch)
3672 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003673
3674 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003675 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003676 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003678 return 1
3679
3680 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003681 if not options.notags:
3682 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003683
3684 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3685 # Clean up the tag if we failed to delete the branch.
3686 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003687
vapiera7fbd5a2016-06-16 09:17:49 -07003688 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003689
3690 return 0
3691
3692
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003693@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003694def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003695 """Show status of changelists.
3696
3697 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003698 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003699 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003700 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003701 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003702 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003703 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003704 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003705
3706 Also see 'git cl comments'.
3707 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003708 parser.add_option(
3709 '--no-branch-color',
3710 action='store_true',
3711 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003712 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003713 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003714 parser.add_option('-f', '--fast', action='store_true',
3715 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003716 parser.add_option(
3717 '-j', '--maxjobs', action='store', type=int,
3718 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003719 parser.add_option(
3720 '-i', '--issue', type=int,
3721 help='Operate on this issue instead of the current branch\'s implicit '
3722 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003723 parser.add_option('-d',
3724 '--date-order',
3725 action='store_true',
3726 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003727 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003728 if args:
3729 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003730
iannuccie53c9352016-08-17 14:40:40 -07003731 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003732 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003733
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003734 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003735 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003736 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003737 if cl.GetIssue():
3738 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003739 elif options.field == 'id':
3740 issueid = cl.GetIssue()
3741 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003742 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003743 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003744 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003745 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003746 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003747 elif options.field == 'status':
3748 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003749 elif options.field == 'url':
3750 url = cl.GetIssueURL()
3751 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003752 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003753 return 0
3754
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003755 branches = RunGit([
3756 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3757 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003758 if not branches:
3759 print('No local branch found.')
3760 return 0
3761
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003762 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003763 Changelist(branchref=b, commit_date=ct)
3764 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3765 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003766 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003767 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003768 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003769 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003770
Edward Lemur85153282020-02-14 22:06:29 +00003771 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003772
3773 def FormatBranchName(branch, colorize=False):
3774 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3775 an asterisk when it is the current branch."""
3776
3777 asterisk = ""
3778 color = Fore.RESET
3779 if branch == current_branch:
3780 asterisk = "* "
3781 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003782 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003783
3784 if colorize:
3785 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003786 return asterisk + branch_name
3787
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003788 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003789
3790 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003791
3792 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003793 sorted_changes = sorted(changes,
3794 key=lambda c: c.GetCommitDate(),
3795 reverse=True)
3796 else:
3797 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3798 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003799 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003800 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003801 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003802 branch_statuses[c.GetBranch()] = status
3803 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003804 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003805 if url and (not status or status == 'error'):
3806 # The issue probably doesn't exist anymore.
3807 url += ' (broken)'
3808
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003809 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003810 # Turn off bold as well as colors.
3811 END = '\033[0m'
3812 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003813 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003814 color = ''
3815 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003816 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003817
Alan Cuttera3be9a52019-03-04 18:50:33 +00003818 branch_display = FormatBranchName(branch)
3819 padding = ' ' * (alignment - len(branch_display))
3820 if not options.no_branch_color:
3821 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003822
Alan Cuttera3be9a52019-03-04 18:50:33 +00003823 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3824 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003825
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003827 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003828 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003829 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003830 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003831 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003832 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003833 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003834 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003835 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003836 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003837 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003838 return 0
3839
3840
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003841def colorize_CMDstatus_doc():
3842 """To be called once in main() to add colors to git cl status help."""
3843 colors = [i for i in dir(Fore) if i[0].isupper()]
3844
3845 def colorize_line(line):
3846 for color in colors:
3847 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003848 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003849 indent = len(line) - len(line.lstrip(' ')) + 1
3850 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3851 return line
3852
3853 lines = CMDstatus.__doc__.splitlines()
3854 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3855
3856
phajdan.jre328cf92016-08-22 04:12:17 -07003857def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003858 if path == '-':
3859 json.dump(contents, sys.stdout)
3860 else:
3861 with open(path, 'w') as f:
3862 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003863
3864
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003865@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003866@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003867def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003868 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003869
3870 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003871 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003872 parser.add_option('-r', '--reverse', action='store_true',
3873 help='Lookup the branch(es) for the specified issues. If '
3874 'no issues are specified, all branches with mapped '
3875 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003876 parser.add_option('--json',
3877 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003878 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003879
dnj@chromium.org406c4402015-03-03 17:22:28 +00003880 if options.reverse:
3881 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003882 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003883 # Reverse issue lookup.
3884 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003885
3886 git_config = {}
3887 for config in RunGit(['config', '--get-regexp',
3888 r'branch\..*issue']).splitlines():
3889 name, _space, val = config.partition(' ')
3890 git_config[name] = val
3891
dnj@chromium.org406c4402015-03-03 17:22:28 +00003892 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003893 issue = git_config.get(
3894 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003895 if issue:
3896 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003897 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003898 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003899 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003900 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003901 try:
3902 issue_num = int(issue)
3903 except ValueError:
3904 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003905 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003906 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003908 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003909 if options.json:
3910 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003911 return 0
3912
3913 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003914 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003915 if not issue.valid:
3916 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3917 'or no argument to list it.\n'
3918 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003919 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003920 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003921 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003922 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003923 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3924 if options.json:
3925 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003926 'gerrit_host': cl.GetGerritHost(),
3927 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003928 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003929 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003930 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003931 return 0
3932
3933
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003934@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003935def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003936 """Shows or posts review comments for any changelist."""
3937 parser.add_option('-a', '--add-comment', dest='comment',
3938 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003939 parser.add_option('-p', '--publish', action='store_true',
3940 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003941 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003942 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003943 parser.add_option('-m', '--machine-readable', dest='readable',
3944 action='store_false', default=True,
3945 help='output comments in a format compatible with '
3946 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003947 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003948 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003949 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003950
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 issue = None
3952 if options.issue:
3953 try:
3954 issue = int(options.issue)
3955 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003956 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003957
Edward Lemur934836a2019-09-09 20:16:54 +00003958 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003959
3960 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003961 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003962 return 0
3963
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003964 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3965 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003966 for comment in summary:
3967 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003968 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003969 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003970 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003971 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003972 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003973 elif comment.autogenerated:
3974 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003975 else:
3976 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003977 print('\n%s%s %s%s\n%s' % (
3978 color,
3979 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3980 comment.sender,
3981 Fore.RESET,
3982 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3983
smut@google.comc85ac942015-09-15 16:34:43 +00003984 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003985 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003986 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003987 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3988 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003989 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003990 return 0
3991
3992
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003993@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003994@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003995def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003996 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003997 parser.add_option('-d', '--display', action='store_true',
3998 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003999 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004000 help='New description to set for this issue (- for stdin, '
4001 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004002 parser.add_option('-f', '--force', action='store_true',
4003 help='Delete any unpublished Gerrit edits for this issue '
4004 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004005
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004006 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004007
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004008 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004009 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004010 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004011 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004012 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004013
Edward Lemur934836a2019-09-09 20:16:54 +00004014 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004015 if target_issue_arg:
4016 kwargs['issue'] = target_issue_arg.issue
4017 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004018
4019 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004020 if not cl.GetIssue():
4021 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004022
Edward Lemur678a6842019-10-03 22:25:05 +00004023 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004024 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004025
Edward Lemur6c6827c2020-02-06 21:15:18 +00004026 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004027
smut@google.com34fb6b12015-07-13 20:03:26 +00004028 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004029 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004030 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004031
4032 if options.new_description:
4033 text = options.new_description
4034 if text == '-':
4035 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004036 elif text == '+':
4037 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004038 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004039
4040 description.set_description(text)
4041 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004042 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004043 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004044 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004045 return 0
4046
4047
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004048@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004049def CMDlint(parser, args):
4050 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004051 parser.add_option('--filter', action='append', metavar='-x,+y',
4052 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004053 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004054
4055 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004056 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004057 try:
4058 import cpplint
4059 import cpplint_chromium
4060 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004062 return 1
4063
4064 # Change the current working directory before calling lint so that it
4065 # shows the correct base.
4066 previous_cwd = os.getcwd()
4067 os.chdir(settings.GetRoot())
4068 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004069 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004070 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004071 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004072 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004073 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004074
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004075 # Process cpplint arguments, if any.
4076 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4077 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004078 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004079
Lei Zhang379d1ad2020-07-15 19:40:06 +00004080 include_regex = re.compile(settings.GetLintRegex())
4081 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004082 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4083 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004084 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004085 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004086 continue
4087
4088 if ignore_regex.match(filename):
4089 print('Ignoring file %s' % filename)
4090 continue
4091
4092 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4093 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004094 finally:
4095 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004096 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004097 if cpplint._cpplint_state.error_count != 0:
4098 return 1
4099 return 0
4100
4101
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004102@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004104 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004105 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004106 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004107 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004108 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004109 parser.add_option('--all', action='store_true',
4110 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004111 parser.add_option('--files',
4112 nargs=1,
4113 help='Semicolon-separated list of files to be marked as '
4114 'modified when executing presubmit or post-upload hooks. '
4115 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004116 parser.add_option('--parallel', action='store_true',
4117 help='Run all tests specified by input_api.RunTests in all '
4118 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004119 parser.add_option('--resultdb', action='store_true',
4120 help='Run presubmit checks in the ResultSink environment '
4121 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004122 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004123 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124
sbc@chromium.org71437c02015-04-09 19:29:40 +00004125 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004126 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004127 return 1
4128
Edward Lemur934836a2019-09-09 20:16:54 +00004129 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004130 if args:
4131 base_branch = args[0]
4132 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004133 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004134 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004135
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004136 if cl.GetIssue():
4137 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004138 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004139 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004140
Bruce Dawson13acea32022-05-03 22:13:08 +00004141 if not base_branch:
4142 if not options.force:
4143 print('use --force to check even when not on a branch.')
4144 return 1
4145 base_branch = 'HEAD'
4146
Josip Sokcevic017544d2022-03-31 23:47:53 +00004147 cl.RunHook(committing=not options.upload,
4148 may_prompt=False,
4149 verbose=options.verbose,
4150 parallel=options.parallel,
4151 upstream=base_branch,
4152 description=description,
4153 all_files=options.all,
4154 files=options.files,
4155 resultdb=options.resultdb,
4156 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004157 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004158
4159
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004160def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004161 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004162
4163 Works the same way as
4164 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4165 but can be called on demand on all platforms.
4166
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004167 The basic idea is to generate git hash of a state of the tree, original
4168 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004169 """
4170 lines = []
4171 tree_hash = RunGitSilent(['write-tree'])
4172 lines.append('tree %s' % tree_hash.strip())
4173 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4174 if code == 0:
4175 lines.append('parent %s' % parent.strip())
4176 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4177 lines.append('author %s' % author.strip())
4178 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4179 lines.append('committer %s' % committer.strip())
4180 lines.append('')
4181 # Note: Gerrit's commit-hook actually cleans message of some lines and
4182 # whitespace. This code is not doing this, but it clearly won't decrease
4183 # entropy.
4184 lines.append(message)
4185 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004186 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004187 return 'I%s' % change_hash.strip()
4188
4189
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004190def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004191 """Computes the remote branch ref to use for the CL.
4192
4193 Args:
4194 remote (str): The git remote for the CL.
4195 remote_branch (str): The git remote branch for the CL.
4196 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004197 """
4198 if not (remote and remote_branch):
4199 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004200
wittman@chromium.org455dc922015-01-26 20:15:50 +00004201 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004202 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004203 # refs, which are then translated into the remote full symbolic refs
4204 # below.
4205 if '/' not in target_branch:
4206 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4207 else:
4208 prefix_replacements = (
4209 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4210 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4211 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4212 )
4213 match = None
4214 for regex, replacement in prefix_replacements:
4215 match = re.search(regex, target_branch)
4216 if match:
4217 remote_branch = target_branch.replace(match.group(0), replacement)
4218 break
4219 if not match:
4220 # This is a branch path but not one we recognize; use as-is.
4221 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004222 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004223 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004224 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004225 # Handle the refs that need to land in different refs.
4226 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004227
wittman@chromium.org455dc922015-01-26 20:15:50 +00004228 # Create the true path to the remote branch.
4229 # Does the following translation:
4230 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004231 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004232 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4233 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4234 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4235 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4236 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4237 'refs/heads/')
4238 elif remote_branch.startswith('refs/remotes/branch-heads'):
4239 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004240
wittman@chromium.org455dc922015-01-26 20:15:50 +00004241 return remote_branch
4242
4243
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004244def cleanup_list(l):
4245 """Fixes a list so that comma separated items are put as individual items.
4246
4247 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4248 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4249 """
4250 items = sum((i.split(',') for i in l), [])
4251 stripped_items = (i.strip() for i in items)
4252 return sorted(filter(None, stripped_items))
4253
4254
Aaron Gable4db38df2017-11-03 14:59:07 -07004255@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004256@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004257def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004258 """Uploads the current changelist to codereview.
4259
4260 Can skip dependency patchset uploads for a branch by running:
4261 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004262 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004263 git config --unset branch.branch_name.skip-deps-uploads
4264 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004265
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004266 If the name of the checked out branch starts with "bug-" or "fix-" followed
4267 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004268 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004269
4270 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004271 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004272 [git-cl] add support for hashtags
4273 Foo bar: implement foo
4274 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004275 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004276 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4277 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004278 parser.add_option('--bypass-watchlists', action='store_true',
4279 dest='bypass_watchlists',
4280 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004281 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004282 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004283 parser.add_option('--message', '-m', dest='message',
4284 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004285 parser.add_option('-b', '--bug',
4286 help='pre-populate the bug number(s) for this issue. '
4287 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004288 parser.add_option('--message-file', dest='message_file',
4289 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004290 parser.add_option('--title', '-t', dest='title',
4291 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004292 parser.add_option('-T', '--skip-title', action='store_true',
4293 dest='skip_title',
4294 help='Use the most recent commit message as the title of '
4295 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004296 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004297 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004298 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004299 parser.add_option('--tbrs',
4300 action='append', default=[],
4301 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004302 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004303 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004304 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004305 parser.add_option('--hashtag', dest='hashtags',
4306 action='append', default=[],
4307 help=('Gerrit hashtag for new CL; '
4308 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004309 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004310 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004311 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004312 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004313 metavar='TARGET',
4314 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004315 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004316 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004317 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004318 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004319 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004320 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004321 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004322 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4323 const='TBR', help='add a set of OWNERS to TBR')
4324 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4325 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004326 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004327 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004328 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004329 'implies --send-mail')
4330 parser.add_option('-d', '--cq-dry-run',
4331 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004332 help='Send the patchset to do a CQ dry run right after '
4333 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004334 parser.add_option(
4335 '-q',
4336 '--cq-quick-run',
4337 action='store_true',
4338 default=False,
4339 help='Send the patchset to do a CQ quick run right after '
4340 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4341 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004342 parser.add_option('--set-bot-commit', action='store_true',
4343 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004344 parser.add_option('--preserve-tryjobs', action='store_true',
4345 help='instruct the CQ to let tryjobs running even after '
4346 'new patchsets are uploaded instead of canceling '
4347 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004348 parser.add_option('--dependencies', action='store_true',
4349 help='Uploads CLs of all the local branches that depend on '
4350 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004351 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4352 help='Sends your change to the CQ after an approval. Only '
4353 'works on repos that have the Auto-Submit label '
4354 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004355 parser.add_option('--parallel', action='store_true',
4356 help='Run all tests specified by input_api.RunTests in all '
4357 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004358 parser.add_option('--no-autocc', action='store_true',
4359 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004360 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004361 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004362 parser.add_option('-R', '--retry-failed', action='store_true',
4363 help='Retry failed tryjobs from old patchset immediately '
4364 'after uploading new patchset. Cannot be used with '
4365 '--use-commit-queue or --cq-dry-run.')
4366 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4367 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004368 parser.add_option('--fixed', '-x',
4369 help='List of bugs that will be commented on and marked '
4370 'fixed (pre-populates "Fixed:" tag). Same format as '
4371 '-b option / "Bug:" tag. If fixing several issues, '
4372 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004373 parser.add_option('--edit-description', action='store_true', default=False,
4374 help='Modify description before upload. Cannot be used '
4375 'with --force. It is a noop when --no-squash is set '
4376 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004377 parser.add_option('--git-completion-helper', action="store_true",
4378 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004379 parser.add_option('--resultdb', action='store_true',
4380 help='Run presubmit checks in the ResultSink environment '
4381 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004382 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004383 parser.add_option('-o',
4384 '--push-options',
4385 action='append',
4386 default=[],
4387 help='Transmit the given string to the server when '
4388 'performing git push (pass-through). See git-push '
4389 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004390 parser.add_option('--no-add-changeid',
4391 action='store_true',
4392 dest='no_add_changeid',
4393 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004394
rmistry@google.com2dd99862015-06-22 12:22:18 +00004395 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004396 (options, args) = parser.parse_args(args)
4397
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004398 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004399 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4400 if opt.help != optparse.SUPPRESS_HELP))
4401 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004402
sbc@chromium.org71437c02015-04-09 19:29:40 +00004403 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004404 return 1
4405
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004406 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004407 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004408 options.cc = cleanup_list(options.cc)
4409
Josipe827b0f2020-01-30 00:07:20 +00004410 if options.edit_description and options.force:
4411 parser.error('Only one of --force and --edit-description allowed')
4412
tandriib80458a2016-06-23 12:20:07 -07004413 if options.message_file:
4414 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004415 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004416 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004417
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004418 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004419 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004420 options.use_commit_queue,
4421 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004422 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4423 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004424
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004425 if options.skip_title and options.title:
4426 parser.error('Only one of --title and --skip-title allowed.')
4427
Aaron Gableedbc4132017-09-11 13:22:28 -07004428 if options.use_commit_queue:
4429 options.send_mail = True
4430
Edward Lesmes0dd54822020-03-26 18:24:25 +00004431 if options.squash is None:
4432 # Load default for user, repo, squash=true, in this order.
4433 options.squash = settings.GetSquashGerritUploads()
4434
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004435 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004436 # Warm change details cache now to avoid RPCs later, reducing latency for
4437 # developers.
4438 if cl.GetIssue():
4439 cl._GetChangeDetail(
4440 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4441
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004442 if options.retry_failed and not cl.GetIssue():
4443 print('No previous patchsets, so --retry-failed has no effect.')
4444 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004445
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004446 # cl.GetMostRecentPatchset uses cached information, and can return the last
4447 # patchset before upload. Calling it here makes it clear that it's the
4448 # last patchset before upload. Note that GetMostRecentPatchset will fail
4449 # if no CL has been uploaded yet.
4450 if options.retry_failed:
4451 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004452
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004453 ret = cl.CMDUpload(options, args, orig_args)
4454
4455 if options.retry_failed:
4456 if ret != 0:
4457 print('Upload failed, so --retry-failed has no effect.')
4458 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004459 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004460 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004461 jobs = _filter_failed_for_retry(builds)
4462 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004463 print('No failed tryjobs, so --retry-failed has no effect.')
4464 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004465 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004466
4467 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004468
4469
Francois Dorayd42c6812017-05-30 15:10:20 -04004470@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004471@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004472def CMDsplit(parser, args):
4473 """Splits a branch into smaller branches and uploads CLs.
4474
4475 Creates a branch and uploads a CL for each group of files modified in the
4476 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004477 comment, the string '$directory', is replaced with the directory containing
4478 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004479 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004480 parser.add_option('-d', '--description', dest='description_file',
4481 help='A text file containing a CL description in which '
4482 '$directory will be replaced by each CL\'s directory.')
4483 parser.add_option('-c', '--comment', dest='comment_file',
4484 help='A text file containing a CL comment.')
4485 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004486 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004487 help='List the files and reviewers for each CL that would '
4488 'be created, but don\'t create branches or CLs.')
4489 parser.add_option('--cq-dry-run', action='store_true',
4490 help='If set, will do a cq dry run for each uploaded CL. '
4491 'Please be careful when doing this; more than ~10 CLs '
4492 'has the potential to overload our build '
4493 'infrastructure. Try to upload these not during high '
4494 'load times (usually 11-3 Mountain View time). Email '
4495 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004496 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4497 default=True,
4498 help='Sends your change to the CQ after an approval. Only '
4499 'works on repos that have the Auto-Submit label '
4500 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004501 options, _ = parser.parse_args(args)
4502
4503 if not options.description_file:
4504 parser.error('No --description flag specified.')
4505
4506 def WrappedCMDupload(args):
4507 return CMDupload(OptionParser(), args)
4508
Edward Lemur2c62b332020-03-12 22:12:33 +00004509 return split_cl.SplitCl(
4510 options.description_file, options.comment_file, Changelist,
4511 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4512 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004513
4514
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004515@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004516@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004517def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004518 """DEPRECATED: Used to commit the current changelist via git-svn."""
4519 message = ('git-cl no longer supports committing to SVN repositories via '
4520 'git-svn. You probably want to use `git cl land` instead.')
4521 print(message)
4522 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523
4524
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004525@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004526@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004527def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004528 """Commits the current changelist via git.
4529
4530 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4531 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004532 """
4533 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4534 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004535 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004536 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004537 parser.add_option('--parallel', action='store_true',
4538 help='Run all tests specified by input_api.RunTests in all '
4539 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004540 parser.add_option('--resultdb', action='store_true',
4541 help='Run presubmit checks in the ResultSink environment '
4542 'and send results to the ResultDB database.')
4543 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004544 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004545
Edward Lemur934836a2019-09-09 20:16:54 +00004546 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004547
Robert Iannucci2e73d432018-03-14 01:10:47 -07004548 if not cl.GetIssue():
4549 DieWithError('You must upload the change first to Gerrit.\n'
4550 ' If you would rather have `git cl land` upload '
4551 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004552 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4553 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004554
4555
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004556@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004557@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004558def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004559 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004560 parser.add_option('-b', dest='newbranch',
4561 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004562 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004563 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004564 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004565 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004566
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004567 group = optparse.OptionGroup(
4568 parser,
4569 'Options for continuing work on the current issue uploaded from a '
4570 'different clone (e.g. different machine). Must be used independently '
4571 'from the other options. No issue number should be specified, and the '
4572 'branch must have an issue number associated with it')
4573 group.add_option('--reapply', action='store_true', dest='reapply',
4574 help='Reset the branch and reapply the issue.\n'
4575 'CAUTION: This will undo any local changes in this '
4576 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004577
4578 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004579 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004580 parser.add_option_group(group)
4581
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004583
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004584 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004585 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004586 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004587 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004588 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004589
Edward Lemur934836a2019-09-09 20:16:54 +00004590 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004591 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004592 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004593
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004594 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004595 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004596 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004597
4598 RunGit(['reset', '--hard', upstream])
4599 if options.pull:
4600 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004601
Edward Lemur678a6842019-10-03 22:25:05 +00004602 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004603 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4604 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004605
4606 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004607 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004608
Edward Lemurf38bc172019-09-03 21:02:13 +00004609 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004610 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004611 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004612
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613 # We don't want uncommitted changes mixed up with the patch.
4614 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004615 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004616
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004617 if options.newbranch:
4618 if options.force:
4619 RunGit(['branch', '-D', options.newbranch],
4620 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004621 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004622
Edward Lemur678a6842019-10-03 22:25:05 +00004623 cl = Changelist(
4624 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004625
Edward Lemur678a6842019-10-03 22:25:05 +00004626 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004627 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004628
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004629 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4630 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631
4632
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004633def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004634 """Fetches the tree status and returns either 'open', 'closed',
4635 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004636 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004637 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004638 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 if status.find('closed') != -1 or status == '0':
4640 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004641
4642 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004643 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004644
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004645 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004646 return 'unset'
4647
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004648
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004649def GetTreeStatusReason():
4650 """Fetches the tree status from a json url and returns the message
4651 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004652 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004653 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004654 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004655 status = json.loads(connection.read())
4656 connection.close()
4657 return status['message']
4658
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004659
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004660@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004662 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004663 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004664 status = GetTreeStatus()
4665 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004666 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004667 return 2
4668
vapiera7fbd5a2016-06-16 09:17:49 -07004669 print('The tree is %s' % status)
4670 print()
4671 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004672 if status != 'open':
4673 return 1
4674 return 0
4675
4676
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004677@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004678def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004679 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4680 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004681 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004682 '-b', '--bot', action='append',
4683 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4684 'times to specify multiple builders. ex: '
4685 '"-b win_rel -b win_layout". See '
4686 'the try server waterfall for the builders name and the tests '
4687 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004688 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004689 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004690 help=('Buildbucket bucket to send the try requests. Format: '
4691 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004692 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004693 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004694 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004695 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004696 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004697 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004698 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004699 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004700 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004701 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004702 '-q',
4703 '--quick-run',
4704 action='store_true',
4705 default=False,
4706 help='trigger in quick run mode '
4707 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4708 'uick_run.md) (chromium only).')
4709 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004710 '--category', default='git_cl_try', help='Specify custom build category.')
4711 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004712 '--project',
4713 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004714 'in recipe to determine to which repository or directory to '
4715 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '-p', '--property', dest='properties', action='append', default=[],
4718 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004719 'key2=value2 etc. The value will be treated as '
4720 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004721 'NOTE: using this may make your tryjob not usable for CQ, '
4722 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004723 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004724 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4725 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004726 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004727 parser.add_option(
4728 '-R', '--retry-failed', action='store_true', default=False,
4729 help='Retry failed jobs from the latest set of tryjobs. '
4730 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004731 parser.add_option(
4732 '-i', '--issue', type=int,
4733 help='Operate on this issue instead of the current branch\'s implicit '
4734 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004735 options, args = parser.parse_args(args)
4736
machenbach@chromium.org45453142015-09-15 08:45:22 +00004737 # Make sure that all properties are prop=value pairs.
4738 bad_params = [x for x in options.properties if '=' not in x]
4739 if bad_params:
4740 parser.error('Got properties with missing "=": %s' % bad_params)
4741
maruel@chromium.org15192402012-09-06 12:38:29 +00004742 if args:
4743 parser.error('Unknown arguments: %s' % args)
4744
Edward Lemur934836a2019-09-09 20:16:54 +00004745 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004746 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004747 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004748
Edward Lemurf38bc172019-09-03 21:02:13 +00004749 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004750 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004751
tandriie113dfd2016-10-11 10:20:12 -07004752 error_message = cl.CannotTriggerTryJobReason()
4753 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004754 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004755
Edward Lemur45768512020-03-02 19:03:14 +00004756 if options.bot:
4757 if options.retry_failed:
4758 parser.error('--bot is not compatible with --retry-failed.')
4759 if not options.bucket:
4760 parser.error('A bucket (e.g. "chromium/try") is required.')
4761
4762 triggered = [b for b in options.bot if 'triggered' in b]
4763 if triggered:
4764 parser.error(
4765 'Cannot schedule builds on triggered bots: %s.\n'
4766 'This type of bot requires an initial job from a parent (usually a '
4767 'builder). Schedule a job on the parent instead.\n' % triggered)
4768
4769 if options.bucket.startswith('.master'):
4770 parser.error('Buildbot masters are not supported.')
4771
4772 project, bucket = _parse_bucket(options.bucket)
4773 if project is None or bucket is None:
4774 parser.error('Invalid bucket: %s.' % options.bucket)
4775 jobs = sorted((project, bucket, bot) for bot in options.bot)
4776 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004777 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004778 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004779 if options.verbose:
4780 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004781 jobs = _filter_failed_for_retry(builds)
4782 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004783 print('There are no failed jobs in the latest set of jobs '
4784 '(patchset #%d), doing nothing.' % patchset)
4785 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004786 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004787 if num_builders > 10:
4788 confirm_or_exit('There are %d builders with failed builds.'
4789 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004790 elif options.quick_run:
4791 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4792 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004793 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004794 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004795 print('git cl try with no bots now defaults to CQ dry run.')
4796 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4797 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004798
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004799 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004800 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004801 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004802 except BuildbucketResponseException as ex:
4803 print('ERROR: %s' % ex)
4804 return 1
4805 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004806
4807
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004808@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004809def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004810 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004811 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004812 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004813 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004814 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004815 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004816 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004817 '--color', action='store_true', default=setup_color.IS_TTY,
4818 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004820 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4821 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004822 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004823 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004824 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004825 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004826 parser.add_option(
4827 '-i', '--issue', type=int,
4828 help='Operate on this issue instead of the current branch\'s implicit '
4829 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004830 options, args = parser.parse_args(args)
4831 if args:
4832 parser.error('Unrecognized args: %s' % ' '.join(args))
4833
Edward Lemur934836a2019-09-09 20:16:54 +00004834 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004836 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004837
tandrii221ab252016-10-06 08:12:04 -07004838 patchset = options.patchset
4839 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004840 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004841 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004842 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004843 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004844 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004845 cl.GetIssue())
4846
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004847 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004848 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004849 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004850 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004851 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004852 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004853 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004854 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004855 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004856 return 0
4857
4858
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004859@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004860@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004861def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004862 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004863 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004864 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004865 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004866
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004867 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004868 if args:
4869 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004870 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004871 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004872 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004873 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004874
4875 # Clear configured merge-base, if there is one.
4876 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004877 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004878 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004879 return 0
4880
4881
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004882@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004883def CMDweb(parser, args):
4884 """Opens the current CL in the web browser."""
4885 _, args = parser.parse_args(args)
4886 if args:
4887 parser.error('Unrecognized args: %s' % ' '.join(args))
4888
4889 issue_url = Changelist().GetIssueURL()
4890 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004891 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004892 return 1
4893
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004894 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004895 # allows us to hide the "Created new window in existing browser session."
4896 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004897 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004898 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004899 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004900 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004901 os.open(os.devnull, os.O_RDWR)
4902 try:
4903 webbrowser.open(issue_url)
4904 finally:
4905 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004906 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004907 return 0
4908
4909
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004910@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004911def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004912 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004913 parser.add_option('-d', '--dry-run', action='store_true',
4914 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004915 parser.add_option(
4916 '-q',
4917 '--quick-run',
4918 action='store_true',
4919 help='trigger in quick run mode '
4920 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4921 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004922 parser.add_option('-c', '--clear', action='store_true',
4923 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004924 parser.add_option(
4925 '-i', '--issue', type=int,
4926 help='Operate on this issue instead of the current branch\'s implicit '
4927 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004928 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004929 if args:
4930 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004931 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4932 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004933
Edward Lemur934836a2019-09-09 20:16:54 +00004934 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004935 if not cl.GetIssue():
4936 parser.error('Must upload the issue first.')
4937
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004938 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004939 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004940 elif options.quick_run:
4941 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004942 elif options.dry_run:
4943 state = _CQState.DRY_RUN
4944 else:
4945 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004946 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004947 return 0
4948
4949
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004950@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004951def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004952 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004953 parser.add_option(
4954 '-i', '--issue', type=int,
4955 help='Operate on this issue instead of the current branch\'s implicit '
4956 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004957 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004958 if args:
4959 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004960 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004961 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004962 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004963 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004964 cl.CloseIssue()
4965 return 0
4966
4967
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004968@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004969def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004970 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004971 parser.add_option(
4972 '--stat',
4973 action='store_true',
4974 dest='stat',
4975 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004976 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004977 if args:
4978 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004979
Edward Lemur934836a2019-09-09 20:16:54 +00004980 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004981 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004982 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004983 if not issue:
4984 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004985
Aaron Gablea718c3e2017-08-28 17:47:28 -07004986 base = cl._GitGetBranchConfigValue('last-upload-hash')
4987 if not base:
4988 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4989 if not base:
4990 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4991 revision_info = detail['revisions'][detail['current_revision']]
4992 fetch_info = revision_info['fetch']['http']
4993 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4994 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004995
Aaron Gablea718c3e2017-08-28 17:47:28 -07004996 cmd = ['git', 'diff']
4997 if options.stat:
4998 cmd.append('--stat')
4999 cmd.append(base)
5000 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005001
5002 return 0
5003
5004
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005005@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005007 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005008 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005009 '--ignore-current',
5010 action='store_true',
5011 help='Ignore the CL\'s current reviewers and start from scratch.')
5012 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005013 '--ignore-self',
5014 action='store_true',
5015 help='Do not consider CL\'s author as an owners.')
5016 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005017 '--no-color',
5018 action='store_true',
5019 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005020 parser.add_option(
5021 '--batch',
5022 action='store_true',
5023 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005024 # TODO: Consider moving this to another command, since other
5025 # git-cl owners commands deal with owners for a given CL.
5026 parser.add_option(
5027 '--show-all',
5028 action='store_true',
5029 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005030 options, args = parser.parse_args(args)
5031
Edward Lemur934836a2019-09-09 20:16:54 +00005032 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005033 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005034
Yang Guo6e269a02019-06-26 11:17:02 +00005035 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005036 if len(args) == 0:
5037 print('No files specified for --show-all. Nothing to do.')
5038 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005039 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005040 for path in args:
5041 print('Owners for %s:' % path)
5042 print('\n'.join(
5043 ' - %s' % owner
5044 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005045 return 0
5046
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005047 if args:
5048 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005049 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005050 base_branch = args[0]
5051 else:
5052 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005053 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005054
Edward Lemur2c62b332020-03-12 22:12:33 +00005055 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005056
5057 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005058 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5059 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005060 return 0
5061
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005062 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005063 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005064 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005065 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005066 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005067 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005068 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005069
5070
Aiden Bennerc08566e2018-10-03 17:52:42 +00005071def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005072 """Generates a diff command."""
5073 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005074 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5075
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005076 if allow_prefix:
5077 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5078 # case that diff.noprefix is set in the user's git config.
5079 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5080 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005081 diff_cmd += ['--no-prefix']
5082
5083 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005084
5085 if args:
5086 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005087 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005088 diff_cmd.append(arg)
5089 else:
5090 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005091
5092 return diff_cmd
5093
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005094
Jamie Madill5e96ad12020-01-13 16:08:35 +00005095def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5096 """Runs clang-format-diff and sets a return value if necessary."""
5097
5098 if not clang_diff_files:
5099 return 0
5100
5101 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5102 # formatted. This is used to block during the presubmit.
5103 return_value = 0
5104
5105 # Locate the clang-format binary in the checkout
5106 try:
5107 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5108 except clang_format.NotFoundError as e:
5109 DieWithError(e)
5110
5111 if opts.full or settings.GetFormatFullByDefault():
5112 cmd = [clang_format_tool]
5113 if not opts.dry_run and not opts.diff:
5114 cmd.append('-i')
5115 if opts.dry_run:
5116 for diff_file in clang_diff_files:
5117 with open(diff_file, 'r') as myfile:
5118 code = myfile.read().replace('\r\n', '\n')
5119 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5120 stdout = stdout.replace('\r\n', '\n')
5121 if opts.diff:
5122 sys.stdout.write(stdout)
5123 if code != stdout:
5124 return_value = 2
5125 else:
5126 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5127 if opts.diff:
5128 sys.stdout.write(stdout)
5129 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005130 try:
5131 script = clang_format.FindClangFormatScriptInChromiumTree(
5132 'clang-format-diff.py')
5133 except clang_format.NotFoundError as e:
5134 DieWithError(e)
5135
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005136 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005137 if not opts.dry_run and not opts.diff:
5138 cmd.append('-i')
5139
5140 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005141 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005142
Edward Lesmes89624cd2020-04-06 17:51:56 +00005143 env = os.environ.copy()
5144 env['PATH'] = (
5145 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5146 stdout = RunCommand(
5147 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005148 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005149 if opts.diff:
5150 sys.stdout.write(stdout)
5151 if opts.dry_run and len(stdout) > 0:
5152 return_value = 2
5153
5154 return return_value
5155
5156
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005157def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5158 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5159 presubmit checks have failed (and returns 0 otherwise)."""
5160
5161 if not rust_diff_files:
5162 return 0
5163
5164 # Locate the rustfmt binary.
5165 try:
5166 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5167 except rustfmt.NotFoundError as e:
5168 DieWithError(e)
5169
5170 # TODO(crbug.com/1231317): Support formatting only the changed lines
5171 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5172 # https://github.com/emilio/rustfmt-format-diff
5173 cmd = [rustfmt_tool]
5174 if opts.dry_run:
5175 cmd.append('--check')
5176 cmd += rust_diff_files
5177 rustfmt_exitcode = subprocess2.call(cmd)
5178
5179 if opts.presubmit and rustfmt_exitcode != 0:
5180 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005181
5182 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005183
5184
Olivier Robin0a6b5442022-04-07 07:25:04 +00005185def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5186 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5187 that presubmit checks have failed (and returns 0 otherwise)."""
5188
5189 if not swift_diff_files:
5190 return 0
5191
5192 # Locate the swift-format binary.
5193 try:
5194 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5195 except swift_format.NotFoundError as e:
5196 DieWithError(e)
5197
5198 cmd = [swift_format_tool]
5199 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005200 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005201 else:
5202 cmd += ['format', '-i']
5203 cmd += swift_diff_files
5204 swift_format_exitcode = subprocess2.call(cmd)
5205
5206 if opts.presubmit and swift_format_exitcode != 0:
5207 return 2
5208
5209 return 0
5210
5211
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005212def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005213 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005214 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005215
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005216
enne@chromium.org555cfe42014-01-29 18:21:39 +00005217@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005218@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005219def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005220 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005221 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005222 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005223 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005224 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005225 parser.add_option('--full', action='store_true',
5226 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005227 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005228 parser.add_option('--dry-run', action='store_true',
5229 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005230 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005231 '--no-clang-format',
5232 dest='clang_format',
5233 action='store_false',
5234 default=True,
5235 help='Disables formatting of various file types using clang-format.')
5236 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005237 '--python',
5238 action='store_true',
5239 default=None,
5240 help='Enables python formatting on all python files.')
5241 parser.add_option(
5242 '--no-python',
5243 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005244 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005245 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005246 'If neither --python or --no-python are set, python files that have a '
5247 '.style.yapf file in an ancestor directory will be formatted. '
5248 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005249 parser.add_option(
5250 '--js',
5251 action='store_true',
5252 help='Format javascript code with clang-format. '
5253 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005254 parser.add_option('--diff', action='store_true',
5255 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005256 parser.add_option('--presubmit', action='store_true',
5257 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005258
5259 parser.add_option('--rust-fmt',
5260 dest='use_rust_fmt',
5261 action='store_true',
5262 default=rustfmt.IsRustfmtSupported(),
5263 help='Enables formatting of Rust file types using rustfmt.')
5264 parser.add_option(
5265 '--no-rust-fmt',
5266 dest='use_rust_fmt',
5267 action='store_false',
5268 help='Disables formatting of Rust file types using rustfmt.')
5269
Olivier Robin0a6b5442022-04-07 07:25:04 +00005270 parser.add_option(
5271 '--swift-format',
5272 dest='use_swift_format',
5273 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005274 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005275 help='Enables formatting of Swift file types using swift-format '
5276 '(macOS host only).')
5277 parser.add_option(
5278 '--no-swift-format',
5279 dest='use_swift_format',
5280 action='store_false',
5281 help='Disables formatting of Swift file types using swift-format.')
5282
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005283 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005284
Garrett Beaty91a6f332020-01-06 16:57:24 +00005285 if opts.python is not None and opts.no_python:
5286 raise parser.error('Cannot set both --python and --no-python')
5287 if opts.no_python:
5288 opts.python = False
5289
Daniel Chengc55eecf2016-12-30 03:11:02 -08005290 # Normalize any remaining args against the current path, so paths relative to
5291 # the current directory are still resolved as expected.
5292 args = [os.path.join(os.getcwd(), arg) for arg in args]
5293
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005294 # git diff generates paths against the root of the repository. Change
5295 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005296 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005297 if rel_base_path:
5298 os.chdir(rel_base_path)
5299
digit@chromium.org29e47272013-05-17 17:01:46 +00005300 # Grab the merge-base commit, i.e. the upstream commit of the current
5301 # branch when it was created or the last time it was rebased. This is
5302 # to cover the case where the user may have called "git fetch origin",
5303 # moving the origin branch to a newer commit, but hasn't rebased yet.
5304 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005305 upstream_branch = opts.upstream
5306 if not upstream_branch:
5307 cl = Changelist()
5308 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005309 if upstream_branch:
5310 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5311 upstream_commit = upstream_commit.strip()
5312
5313 if not upstream_commit:
5314 DieWithError('Could not find base commit for this branch. '
5315 'Are you in detached state?')
5316
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005317 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5318 diff_output = RunGit(changed_files_cmd)
5319 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005320 # Filter out files deleted by this CL
5321 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005322
Andreas Haas417d89c2020-02-06 10:24:27 +00005323 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005324 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005325
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005326 clang_diff_files = []
5327 if opts.clang_format:
5328 clang_diff_files = [
5329 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5330 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005331 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005332 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005333 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005334 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005335
Edward Lesmes50da7702020-03-30 19:23:43 +00005336 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005337
Jamie Madill5e96ad12020-01-13 16:08:35 +00005338 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5339 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005340
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005341 if opts.use_rust_fmt:
5342 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5343 upstream_commit)
5344 if rust_fmt_return_value == 2:
5345 return_value = 2
5346
Olivier Robin0a6b5442022-04-07 07:25:04 +00005347 if opts.use_swift_format:
5348 if sys.platform != 'darwin':
5349 DieWithError('swift-format is only supported on macOS.')
5350 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5351 upstream_commit)
5352 if swift_format_return_value == 2:
5353 return_value = 2
5354
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005355 # Similar code to above, but using yapf on .py files rather than clang-format
5356 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005357 py_explicitly_disabled = opts.python is not None and not opts.python
5358 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005359 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5360 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005361
Aiden Bennerc08566e2018-10-03 17:52:42 +00005362 # Used for caching.
5363 yapf_configs = {}
5364 for f in python_diff_files:
5365 # Find the yapf style config for the current file, defaults to depot
5366 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005367 _FindYapfConfigFile(f, yapf_configs, top_dir)
5368
5369 # Turn on python formatting by default if a yapf config is specified.
5370 # This breaks in the case of this repo though since the specified
5371 # style file is also the global default.
5372 if opts.python is None:
5373 filtered_py_files = []
5374 for f in python_diff_files:
5375 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5376 filtered_py_files.append(f)
5377 else:
5378 filtered_py_files = python_diff_files
5379
5380 # Note: yapf still seems to fix indentation of the entire file
5381 # even if line ranges are specified.
5382 # See https://github.com/google/yapf/issues/499
5383 if not opts.full and filtered_py_files:
5384 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5385
Brian Sheedyb4307d52019-12-02 19:18:17 +00005386 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5387 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5388 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005389
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005390 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005391 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5392 # Default to pep8 if not .style.yapf is found.
5393 if not yapf_style:
5394 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005395
Peter Wend9399922020-06-17 17:33:49 +00005396 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005397 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005398 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005399 else:
5400 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005401
5402 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005403
5404 has_formattable_lines = False
5405 if not opts.full:
5406 # Only run yapf over changed line ranges.
5407 for diff_start, diff_len in py_line_diffs[f]:
5408 diff_end = diff_start + diff_len - 1
5409 # Yapf errors out if diff_end < diff_start but this
5410 # is a valid line range diff for a removal.
5411 if diff_end >= diff_start:
5412 has_formattable_lines = True
5413 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5414 # If all line diffs were removals we have nothing to format.
5415 if not has_formattable_lines:
5416 continue
5417
5418 if opts.diff or opts.dry_run:
5419 cmd += ['--diff']
5420 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005421 stdout = RunCommand(cmd,
5422 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005423 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005424 cwd=top_dir,
5425 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005426 if opts.diff:
5427 sys.stdout.write(stdout)
5428 elif len(stdout) > 0:
5429 return_value = 2
5430 else:
5431 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005432 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005433
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005434 # Format GN build files. Always run on full build files for canonical form.
5435 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005436 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005437 if opts.dry_run or opts.diff:
5438 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005439 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005440 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005441 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005442 cwd=top_dir)
5443 if opts.dry_run and gn_ret == 2:
5444 return_value = 2 # Not formatted.
5445 elif opts.diff and gn_ret == 2:
5446 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005447 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005448 elif gn_ret != 0:
5449 # For non-dry run cases (and non-2 return values for dry-run), a
5450 # nonzero error code indicates a failure, probably because the file
5451 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005452 DieWithError('gn format failed on ' + gn_diff_file +
5453 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005454
Ilya Shermane081cbe2017-08-15 17:51:04 -07005455 # Skip the metrics formatting from the global presubmit hook. These files have
5456 # a separate presubmit hook that issues an error if the files need formatting,
5457 # whereas the top-level presubmit script merely issues a warning. Formatting
5458 # these files is somewhat slow, so it's important not to duplicate the work.
5459 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005460 for diff_xml in GetDiffXMLs(diff_files):
5461 xml_dir = GetMetricsDir(diff_xml)
5462 if not xml_dir:
5463 continue
5464
Ilya Shermane081cbe2017-08-15 17:51:04 -07005465 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005466 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5467 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005468
5469 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5470 # command as histograms/pretty_print.py now needs a relative path argument
5471 # after splitting the histograms into multiple directories.
5472 # For example, in tools/metrics/ukm, pretty-print could be run using:
5473 # $ python pretty_print.py
5474 # But in tools/metrics/histogrmas, pretty-print should be run with an
5475 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005476 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005477 # $ python pretty_print.py enums.xml
5478
5479 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5480 # version of histograms/pretty_print.py is released.
5481 filepath_required = os.path.exists(
5482 os.path.join(tool_dir, 'validate_prefix.py'))
5483
Weilun Shib92c4b72020-08-27 17:45:11 +00005484 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5485 or diff_xml.endswith('histogram_suffixes_list.xml')
5486 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005487 cmd.append(diff_xml)
5488
Ilya Shermane081cbe2017-08-15 17:51:04 -07005489 if opts.dry_run or opts.diff:
5490 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005491
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005492 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5493 # `shell` param and instead replace `'vpython'` with
5494 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005495 stdout = RunCommand(cmd,
5496 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005497 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005498 if opts.diff:
5499 sys.stdout.write(stdout)
5500 if opts.dry_run and stdout:
5501 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005502
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005503 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005504
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005505
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005506def GetDiffXMLs(diff_files):
5507 return [
5508 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5509 ]
5510
5511
5512def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005513 metrics_xml_dirs = [
5514 os.path.join('tools', 'metrics', 'actions'),
5515 os.path.join('tools', 'metrics', 'histograms'),
5516 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005517 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005518 os.path.join('tools', 'metrics', 'ukm'),
5519 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005520 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005521 if diff_xml.startswith(xml_dir):
5522 return xml_dir
5523 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005524
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005525
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005526@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005527@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005528def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005529 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005530 _, args = parser.parse_args(args)
5531
5532 if len(args) != 1:
5533 parser.print_help()
5534 return 1
5535
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005536 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005537 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005538 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005539
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005540 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005541
Edward Lemur52969c92020-02-06 18:15:28 +00005542 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005543 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005544 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005545
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005546 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005547 for key, issue in [x.split() for x in output.splitlines()]:
5548 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005549 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005550
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005551 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005552 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005553 return 1
5554 if len(branches) == 1:
5555 RunGit(['checkout', branches[0]])
5556 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005557 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005558 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005559 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005560 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005561 try:
5562 RunGit(['checkout', branches[int(which)]])
5563 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005564 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005565 return 1
5566
5567 return 0
5568
5569
maruel@chromium.org29404b52014-09-08 22:58:00 +00005570def CMDlol(parser, args):
5571 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005572 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005573 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5574 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5575 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005576 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005577 return 0
5578
5579
Josip Sokcevic0399e172022-03-21 23:11:51 +00005580def CMDversion(parser, args):
5581 import utils
5582 print(utils.depot_tools_version())
5583
5584
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005585class OptionParser(optparse.OptionParser):
5586 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005587
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005588 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005589 optparse.OptionParser.__init__(
5590 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005591 self.add_option(
5592 '-v', '--verbose', action='count', default=0,
5593 help='Use 2 times for more debugging info')
5594
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005595 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005596 try:
5597 return self._parse_args(args)
5598 finally:
5599 # Regardless of success or failure of args parsing, we want to report
5600 # metrics, but only after logging has been initialized (if parsing
5601 # succeeded).
5602 global settings
5603 settings = Settings()
5604
Edward Lesmes9c349062021-05-06 20:02:39 +00005605 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005606 # GetViewVCUrl ultimately calls logging method.
5607 project_url = settings.GetViewVCUrl().strip('/+')
5608 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5609 metrics.collector.add('project_urls', [project_url])
5610
5611 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005612 # Create an optparse.Values object that will store only the actual passed
5613 # options, without the defaults.
5614 actual_options = optparse.Values()
5615 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5616 # Create an optparse.Values object with the default options.
5617 options = optparse.Values(self.get_default_values().__dict__)
5618 # Update it with the options passed by the user.
5619 options._update_careful(actual_options.__dict__)
5620 # Store the options passed by the user in an _actual_options attribute.
5621 # We store only the keys, and not the values, since the values can contain
5622 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005623 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005624
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005625 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005626 logging.basicConfig(
5627 level=levels[min(options.verbose, len(levels) - 1)],
5628 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5629 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005630
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005631 return options, args
5632
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005633
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005634def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005635 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005636 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005637 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005638 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005639
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005640 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005641 dispatcher = subcommand.CommandDispatcher(__name__)
5642 try:
5643 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005644 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005645 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005646 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005647 if e.code != 500:
5648 raise
5649 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005650 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005651 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005652 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005653
5654
5655if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005656 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5657 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005658 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005659 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005660 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005661 sys.exit(main(sys.argv[1:]))