blob: e4b1e285f7d1f8d722ebf1a1a91cbe690dda6e4d [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(
Edward Lesmese1576912021-02-16 21:53:34 +00001026 host=self.GetGerritHost(),
1027 project=self.GetGerritProject(),
1028 branch=branch)
1029 return self._owners_client
1030
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001031 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001032 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001033
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001034 The return value is a string suitable for passing to git cl with the --cc
1035 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001036 """
1037 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001038 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001039 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001040 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1041 return self.cc
1042
Daniel Cheng7227d212017-11-17 08:12:37 -08001043 def ExtendCC(self, more_cc):
1044 """Extends the list of users to cc on this CL based on the changed files."""
1045 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001047 def GetCommitDate(self):
1048 """Returns the commit date as provided in the constructor"""
1049 return self.commit_date
1050
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001052 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001053 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001054 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001055 if not branchref:
1056 return None
1057 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001058 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 return self.branch
1060
1061 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001062 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001063 self.GetBranch() # Poke the lazy loader.
1064 return self.branchref
1065
Edward Lemur85153282020-02-14 22:06:29 +00001066 def _GitGetBranchConfigValue(self, key, default=None):
1067 return scm.GIT.GetBranchConfig(
1068 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001069
Edward Lemur85153282020-02-14 22:06:29 +00001070 def _GitSetBranchConfigValue(self, key, value):
1071 action = 'set %s to %r' % (key, value)
1072 if not value:
1073 action = 'unset %s' % key
1074 assert self.GetBranch(), 'a branch is needed to ' + action
1075 return scm.GIT.SetBranchConfig(
1076 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001077
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001078 @staticmethod
1079 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001080 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001081 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001083 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1084 settings.GetRoot(), branch)
1085 if not remote or not upstream_branch:
1086 DieWithError(
1087 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001088 'Verify this branch is set up to track another \n'
1089 '(via the --track argument to "git checkout -b ..."). \n'
1090 'or pass complete "git diff"-style arguments if supported, like\n'
1091 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092
1093 return remote, upstream_branch
1094
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001095 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001096 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001097 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001098 DieWithError('The upstream for the current branch (%s) does not exist '
1099 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001100 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001101 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001102
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 def GetUpstreamBranch(self):
1104 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001105 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001106 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001107 upstream_branch = upstream_branch.replace('refs/heads/',
1108 'refs/remotes/%s/' % remote)
1109 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1110 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 self.upstream_branch = upstream_branch
1112 return self.upstream_branch
1113
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001115 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 remote, branch = None, self.GetBranch()
1117 seen_branches = set()
1118 while branch not in seen_branches:
1119 seen_branches.add(branch)
1120 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001121 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001122 if remote != '.' or branch.startswith('refs/remotes'):
1123 break
1124 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001125 remotes = RunGit(['remote'], error_ok=True).split()
1126 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001127 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001128 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001129 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001130 logging.warning('Could not determine which remote this change is '
1131 'associated with, so defaulting to "%s".' %
1132 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001133 else:
Gavin Make6a62332020-12-04 21:57:10 +00001134 logging.warning('Could not determine which remote this change is '
1135 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001136 branch = 'HEAD'
1137 if branch.startswith('refs/remotes'):
1138 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001139 elif branch.startswith('refs/branch-heads/'):
1140 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001141 else:
1142 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001143 return self._remote
1144
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 def GetRemoteUrl(self):
1146 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1147
1148 Returns None if there is no remote.
1149 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001150 is_cached, value = self._cached_remote_url
1151 if is_cached:
1152 return value
1153
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001154 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001155 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001156
Edward Lemur298f2cf2019-02-22 21:40:39 +00001157 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001158 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001159 if host:
1160 self._cached_remote_url = (True, url)
1161 return url
1162
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001163 # If it cannot be parsed as an url, assume it is a local directory,
1164 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001165 logging.warning('"%s" doesn\'t appear to point to a git host. '
1166 'Interpreting it as a local directory.', url)
1167 if not os.path.isdir(url):
1168 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001169 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1170 'but it doesn\'t exist.',
1171 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001172 return None
1173
1174 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001175 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001176
Edward Lemur79d4f992019-11-11 23:49:02 +00001177 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001178 if not host:
1179 logging.error(
1180 'Remote "%(remote)s" for branch "%(branch)s" points to '
1181 '"%(cache_path)s", but it is misconfigured.\n'
1182 '"%(cache_path)s" must be a git repo and must have a remote named '
1183 '"%(remote)s" pointing to the git host.', {
1184 'remote': remote,
1185 'cache_path': cache_path,
1186 'branch': self.GetBranch()})
1187 return None
1188
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001189 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001190 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001192 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001193 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001194 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001195 if self.GetBranch():
1196 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001197 if self.issue is not None:
1198 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001199 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001200 return self.issue
1201
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001202 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001204 issue = self.GetIssue()
1205 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001206 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001207 server = self.GetCodereviewServer()
1208 if short:
1209 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1210 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001211
Dirk Pranke6f0df682021-06-25 00:42:33 +00001212 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001213 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001214
Edward Lemur6c6827c2020-02-06 21:15:18 +00001215 def FetchDescription(self, pretty=False):
1216 assert self.GetIssue(), 'issue is required to query Gerrit'
1217
Edward Lemur9aa1a962020-02-25 00:58:38 +00001218 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001219 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1220 current_rev = data['current_revision']
1221 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001222
1223 if not pretty:
1224 return self.description
1225
1226 # Set width to 72 columns + 2 space indent.
1227 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1228 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1229 lines = self.description.splitlines()
1230 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231
1232 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001233 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001234 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001235 if self.GetBranch():
1236 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001237 if self.patchset is not None:
1238 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001239 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001240 return self.patchset
1241
Edward Lemur9aa1a962020-02-25 00:58:38 +00001242 def GetAuthor(self):
1243 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1244
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001246 """Set this branch's patchset. If patchset=0, clears the patchset."""
1247 assert self.GetBranch()
1248 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001249 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001250 else:
1251 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001252 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001254 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001255 """Set this branch's issue. If issue isn't given, clears the issue."""
1256 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001258 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001259 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001260 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001261 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001262 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001263 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001264 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 else:
tandrii5d48c322016-08-18 16:19:37 -07001266 # Reset all of these just to be clean.
1267 reset_suffixes = [
1268 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001269 ISSUE_CONFIG_KEY,
1270 PATCHSET_CONFIG_KEY,
1271 CODEREVIEW_SERVER_CONFIG_KEY,
1272 'gerritsquashhash',
1273 ]
tandrii5d48c322016-08-18 16:19:37 -07001274 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001275 try:
1276 self._GitSetBranchConfigValue(prop, None)
1277 except subprocess2.CalledProcessError:
1278 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001279 msg = RunGit(['log', '-1', '--format=%B']).strip()
1280 if msg and git_footers.get_footer_change_id(msg):
1281 print('WARNING: The change patched into this branch has a Change-Id. '
1282 'Removing it.')
1283 RunGit(['commit', '--amend', '-m',
1284 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001285 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001286 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001287 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288
Edward Lemur2c62b332020-03-12 22:12:33 +00001289 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001290 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001291 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001292 except subprocess2.CalledProcessError:
1293 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001294 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001295 'This branch probably doesn\'t exist anymore. To reset the\n'
1296 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001297 ' git branch --set-upstream-to origin/main %s\n'
1298 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001299 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001300
dsansomee2d6fd92016-09-08 00:10:47 -07001301 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001302 assert self.GetIssue(), 'issue is required to update description'
1303
1304 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001305 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001306 if not force:
1307 confirm_or_exit(
1308 'The description cannot be modified while the issue has a pending '
1309 'unpublished edit. Either publish the edit in the Gerrit web UI '
1310 'or delete it.\n\n', action='delete the unpublished edit')
1311
1312 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001313 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001314 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001315 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001316 description, notify='NONE')
1317
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001318 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001319
Edward Lemur75526302020-02-27 22:31:05 +00001320 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001321 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001322 '--root', settings.GetRoot(),
1323 '--upstream', upstream,
1324 ]
1325
1326 args.extend(['--verbose'] * verbose)
1327
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001328 remote, remote_branch = self.GetRemoteBranch()
1329 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001330 if settings.GetIsGerrit():
1331 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1332 args.extend(['--gerrit_project', self.GetGerritProject()])
1333 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001334
Edward Lemur99df04e2020-03-05 19:39:43 +00001335 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001336 issue = self.GetIssue()
1337 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001338 if author:
1339 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001340 if issue:
1341 args.extend(['--issue', str(issue)])
1342 if patchset:
1343 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001344
Edward Lemur75526302020-02-27 22:31:05 +00001345 return args
1346
Josip Sokcevic017544d2022-03-31 23:47:53 +00001347 def RunHook(self,
1348 committing,
1349 may_prompt,
1350 verbose,
1351 parallel,
1352 upstream,
1353 description,
1354 all_files,
1355 files=None,
1356 resultdb=False,
1357 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001358 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1359 args = self._GetCommonPresubmitArgs(verbose, upstream)
1360 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001361 if may_prompt:
1362 args.append('--may_prompt')
1363 if parallel:
1364 args.append('--parallel')
1365 if all_files:
1366 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001367 if files:
1368 args.extend(files.split(';'))
1369 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001370 if files or all_files:
1371 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001372
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001373 if resultdb and not realm:
1374 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1375 # it is not required to pass the realm flag
1376 print('Note: ResultDB reporting will NOT be performed because --realm'
1377 ' was not specified. To enable ResultDB, please run the command'
1378 ' again with the --realm argument to specify the LUCI realm.')
1379
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001380 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1381 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001382 if py3_results.get('skipped_presubmits', 1) == 0:
1383 print('No more presubmits to run - skipping Python 2 presubmits.')
1384 return py3_results
1385
1386 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1387 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001388 return self._MergePresubmitResults(py2_results, py3_results)
1389
1390 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1391 args = args[:]
1392 vpython = 'vpython3' if use_python3 else 'vpython'
1393
Edward Lemur227d5102020-02-25 23:45:35 +00001394 with gclient_utils.temporary_file() as description_file:
1395 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001396 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001397 args.extend(['--json_output', json_output])
1398 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001399 if self.GetUsePython3():
1400 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001401 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001402 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001403 if resultdb and realm:
1404 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001405
1406 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001407 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001408
Edward Lemur227d5102020-02-25 23:45:35 +00001409 metrics.collector.add_repeated('sub_commands', {
1410 'command': 'presubmit',
1411 'execution_time': time_time() - start,
1412 'exit_code': exit_code,
1413 })
1414
1415 if exit_code:
1416 sys.exit(exit_code)
1417
1418 json_results = gclient_utils.FileRead(json_output)
1419 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001420
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001421 def _MergePresubmitResults(self, py2_results, py3_results):
1422 return {
1423 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1424 py3_results.get('more_cc', []))),
1425 'errors': (
1426 py2_results.get('errors', []) + py3_results.get('errors', [])),
1427 'notifications': (
1428 py2_results.get('notifications', []) +
1429 py3_results.get('notifications', [])),
1430 'warnings': (
1431 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1432 }
1433
Edward Lemur75526302020-02-27 22:31:05 +00001434 def RunPostUploadHook(self, verbose, upstream, description):
1435 args = self._GetCommonPresubmitArgs(verbose, upstream)
1436 args.append('--post_upload')
1437
1438 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001439 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001440 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001441 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1442 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1443 ['--use-python3'])
1444 p_py2.wait()
1445 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001446
Edward Lemur5a644f82020-03-18 16:44:57 +00001447 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1448 # Get description message for upload.
1449 if self.GetIssue():
1450 description = self.FetchDescription()
1451 elif options.message:
1452 description = options.message
1453 else:
1454 description = _create_description_from_log(git_diff_args)
1455 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001456 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001457
Edward Lemur5a644f82020-03-18 16:44:57 +00001458 bug = options.bug
1459 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001460 if not self.GetIssue():
1461 # Extract bug number from branch name, but only if issue is being created.
1462 # It must start with bug or fix, followed by _ or - and number.
1463 # Optionally, it may contain _ or - after number with arbitrary text.
1464 # Examples:
1465 # bug-123
1466 # bug_123
1467 # fix-123
1468 # fix-123-some-description
1469 match = re.match(
1470 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1471 self.GetBranch())
1472 if not bug and not fixed and match:
1473 if match.group('type') == 'bug':
1474 bug = match.group('bugnum')
1475 else:
1476 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001477
1478 change_description = ChangeDescription(description, bug, fixed)
1479
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001480 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1481 if options.add_owners_to:
1482 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001483 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001484 files, [], options.tbrs + options.reviewers)
1485 missing_files = [
1486 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001487 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001488 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001489 owners = self.owners_client.SuggestOwners(
1490 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001491 if options.add_owners_to == 'TBR':
1492 assert isinstance(options.tbrs, list), options.tbrs
1493 options.tbrs.extend(owners)
1494 else:
1495 assert isinstance(options.reviewers, list), options.reviewers
1496 options.reviewers.extend(owners)
1497
Edward Lemur5a644f82020-03-18 16:44:57 +00001498 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001499 if options.reviewers or options.tbrs:
1500 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001501
1502 return change_description
1503
1504 def _GetTitleForUpload(self, options):
manukh566e9d02022-06-30 19:49:53 +00001505 # When not squashing or options.title is provided, just return
1506 # options.title.
1507 if not options.squash or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001508 return options.title
1509
1510 # On first upload, patchset title is always this string, while options.title
1511 # gets converted to first line of message.
1512 if not self.GetIssue():
1513 return 'Initial upload'
1514
1515 # When uploading subsequent patchsets, options.message is taken as the title
1516 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001517 if options.message:
1518 return options.message.strip()
1519
1520 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001521 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001522 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001523 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001524 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001525
1526 # Use the default title if the user confirms the default with a 'y'.
1527 if user_title.lower() == 'y':
1528 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001529 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001530
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001531 def CMDUpload(self, options, git_diff_args, orig_args):
1532 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001533 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001534 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001535 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536 else:
1537 if self.GetBranch() is None:
1538 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1539
1540 # Default to diffing against common ancestor of upstream branch
1541 base_branch = self.GetCommonAncestorWithUpstream()
1542 git_diff_args = [base_branch, 'HEAD']
1543
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001544 # Fast best-effort checks to abort before running potentially expensive
1545 # hooks if uploading is likely to fail anyway. Passing these checks does
1546 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001547 self.EnsureAuthenticated(force=options.force)
1548 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001549
1550 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001551 watchlist = watchlists.Watchlists(settings.GetRoot())
1552 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001553 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001554 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001555
Edward Lemur5a644f82020-03-18 16:44:57 +00001556 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001558 hook_results = self.RunHook(
1559 committing=False,
1560 may_prompt=not options.force,
1561 verbose=options.verbose,
1562 parallel=options.parallel,
1563 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001564 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001565 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001566 resultdb=options.resultdb,
1567 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001568 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569
Aaron Gable13101a62018-02-09 13:20:41 -08001570 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001571 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001572 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001574 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001575 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 # Run post upload hooks, if specified.
1577 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001578 self.RunPostUploadHook(
1579 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001580
1581 # Upload all dependencies if specified.
1582 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001583 print()
1584 print('--dependencies has been specified.')
1585 print('All dependent local branches will be re-uploaded.')
1586 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 # Remove the dependencies flag from args so that we do not end up in a
1588 # loop.
1589 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001590 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 return ret
1592
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001593 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001594 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001595
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001596 Issue must have been already uploaded and known. Optionally allows for
1597 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001598 """
1599 assert new_state in _CQState.ALL_STATES
1600 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001601 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001602 vote_map = {
1603 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001604 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001605 _CQState.DRY_RUN: 1,
1606 _CQState.COMMIT: 2,
1607 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001608 if new_state == _CQState.QUICK_RUN:
1609 labels = {
1610 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1611 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1612 }
1613 else:
1614 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001615 notify = False if new_state == _CQState.DRY_RUN else None
1616 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001617 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001618 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001619 return 0
1620 except KeyboardInterrupt:
1621 raise
1622 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001623 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001624 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001625 ' * Your project has no CQ,\n'
1626 ' * You don\'t have permission to change the CQ state,\n'
1627 ' * There\'s a bug in this code (see stack trace below).\n'
1628 'Consider specifying which bots to trigger manually or asking your '
1629 'project owners for permissions or contacting Chrome Infra at:\n'
1630 'https://www.chromium.org/infra\n\n' %
1631 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001632 # Still raise exception so that stack trace is printed.
1633 raise
1634
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001635 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001636 # Lazy load of configs.
1637 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001638 if self._gerrit_host and '.' not in self._gerrit_host:
1639 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1640 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001641 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001642 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001643 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001644 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001645 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1646 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001647 return self._gerrit_host
1648
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001649 def _GetGitHost(self):
1650 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001651 remote_url = self.GetRemoteUrl()
1652 if not remote_url:
1653 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001654 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001655
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001656 def GetCodereviewServer(self):
1657 if not self._gerrit_server:
1658 # If we're on a branch then get the server potentially associated
1659 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001660 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001661 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001662 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001663 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001664 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001665 if not self._gerrit_server:
1666 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1667 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001668 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001669 parts[0] = parts[0] + '-review'
1670 self._gerrit_host = '.'.join(parts)
1671 self._gerrit_server = 'https://%s' % self._gerrit_host
1672 return self._gerrit_server
1673
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001674 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001675 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001676 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001677 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001678 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001679 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001680 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001681 if project.endswith('.git'):
1682 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001683 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1684 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1685 # gitiles/git-over-https protocol. E.g.,
1686 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1687 # as
1688 # https://chromium.googlesource.com/v8/v8
1689 if project.startswith('a/'):
1690 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001691 return project
1692
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001693 def _GerritChangeIdentifier(self):
1694 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1695
1696 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001697 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001698 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001699 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001700 if project:
1701 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1702 # Fall back on still unique, but less efficient change number.
1703 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001704
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001705 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001706 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001707 if settings.GetGerritSkipEnsureAuthenticated():
1708 # For projects with unusual authentication schemes.
1709 # See http://crbug.com/603378.
1710 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001711
1712 # Check presence of cookies only if using cookies-based auth method.
1713 cookie_auth = gerrit_util.Authenticator.get()
1714 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001715 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001716
Florian Mayerae510e82020-01-30 21:04:48 +00001717 remote_url = self.GetRemoteUrl()
1718 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001719 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001720 return
1721 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001722 logging.warning('Ignoring branch %(branch)s with non-https remote '
1723 '%(remote)s', {
1724 'branch': self.branch,
1725 'remote': self.GetRemoteUrl()
1726 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001727 return
1728
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001729 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001730 self.GetCodereviewServer()
1731 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001732 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001733
1734 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1735 git_auth = cookie_auth.get_auth_header(git_host)
1736 if gerrit_auth and git_auth:
1737 if gerrit_auth == git_auth:
1738 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001739 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001740 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001741 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001742 ' %s\n'
1743 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001744 ' Consider running the following command:\n'
1745 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001746 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001747 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001748 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001749 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001750 cookie_auth.get_new_password_message(git_host)))
1751 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001752 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001753 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001754
1755 missing = (
1756 ([] if gerrit_auth else [self._gerrit_host]) +
1757 ([] if git_auth else [git_host]))
1758 DieWithError('Credentials for the following hosts are required:\n'
1759 ' %s\n'
1760 'These are read from %s (or legacy %s)\n'
1761 '%s' % (
1762 '\n '.join(missing),
1763 cookie_auth.get_gitcookies_path(),
1764 cookie_auth.get_netrc_path(),
1765 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001766
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001767 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001768 if not self.GetIssue():
1769 return
1770
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001771 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001772 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001773 DieWithError(
1774 'Change %s has been abandoned, new uploads are not allowed' %
1775 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001776 if status == 'MERGED':
1777 answer = gclient_utils.AskForData(
1778 'Change %s has been submitted, new uploads are not allowed. '
1779 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1780 ).lower()
1781 if answer not in ('y', ''):
1782 DieWithError('New uploads are not allowed.')
1783 self.SetIssue()
1784 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001785
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001786 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1787 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1788 # Apparently this check is not very important? Otherwise get_auth_email
1789 # could have been added to other implementations of Authenticator.
1790 cookies_auth = gerrit_util.Authenticator.get()
1791 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001792 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001793
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001794 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001795 if self.GetIssueOwner() == cookies_user:
1796 return
1797 logging.debug('change %s owner is %s, cookies user is %s',
1798 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001799 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001800 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001801 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001802 if details['email'] == self.GetIssueOwner():
1803 return
1804 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001805 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 'as %s.\n'
1807 'Uploading may fail due to lack of permissions.' %
1808 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1809 confirm_or_exit(action='upload')
1810
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001811 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001812 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001813 or CQ status, assuming adherence to a common workflow.
1814
1815 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001816 * 'error' - error from review tool (including deleted issues)
1817 * 'unsent' - no reviewers added
1818 * 'waiting' - waiting for review
1819 * 'reply' - waiting for uploader to reply to review
1820 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001821 * 'dry-run' - dry-running in the CQ
1822 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001823 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001824 """
1825 if not self.GetIssue():
1826 return None
1827
1828 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001829 data = self._GetChangeDetail([
1830 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001831 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001832 return 'error'
1833
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001834 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001835 return 'closed'
1836
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001837 cq_label = data['labels'].get('Commit-Queue', {})
1838 max_cq_vote = 0
1839 for vote in cq_label.get('all', []):
1840 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1841 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001842 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001843 if max_cq_vote == 1:
1844 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001845
Aaron Gable9ab38c62017-04-06 14:36:33 -07001846 if data['labels'].get('Code-Review', {}).get('approved'):
1847 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001848
1849 if not data.get('reviewers', {}).get('REVIEWER', []):
1850 return 'unsent'
1851
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001852 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001853 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001854 while messages:
1855 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001856 if (m.get('tag', '').startswith('autogenerated:cq') or
1857 m.get('tag', '').startswith('autogenerated:cv')):
1858 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001859 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001860 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001861 # Most recent message was by owner.
1862 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001863
1864 # Some reply from non-owner.
1865 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001866
1867 # Somehow there are no messages even though there are reviewers.
1868 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001869
1870 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001871 if not self.GetIssue():
1872 return None
1873
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001874 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001875 patchset = data['revisions'][data['current_revision']]['_number']
1876 self.SetPatchset(patchset)
1877 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001878
Gavin Make61ccc52020-11-13 00:12:57 +00001879 def GetMostRecentDryRunPatchset(self):
1880 """Get patchsets equivalent to the most recent patchset and return
1881 the patchset with the latest dry run. If none have been dry run, return
1882 the latest patchset."""
1883 if not self.GetIssue():
1884 return None
1885
1886 data = self._GetChangeDetail(['ALL_REVISIONS'])
1887 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001888 dry_run = {int(m['_revision_number'])
1889 for m in data.get('messages', [])
1890 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001891
1892 for revision_info in sorted(data.get('revisions', {}).values(),
1893 key=lambda c: c['_number'], reverse=True):
1894 if revision_info['_number'] in dry_run:
1895 patchset = revision_info['_number']
1896 break
1897 if revision_info.get('kind', '') not in \
1898 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1899 break
1900 self.SetPatchset(patchset)
1901 return patchset
1902
Aaron Gable636b13f2017-07-14 10:42:48 -07001903 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001904 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001905 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001906 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001907
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001908 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001909 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001910 # CURRENT_REVISION is included to get the latest patchset so that
1911 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001912 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001913 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1914 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001915 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001916 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001917 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001918 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001919
1920 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001921 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001922 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001923 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001924 line_comments = file_comments.setdefault(path, [])
1925 line_comments.extend(
1926 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001927
1928 # Build dictionary of file comments for easy access and sorting later.
1929 # {author+date: {path: {patchset: {line: url+message}}}}
1930 comments = collections.defaultdict(
1931 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001932
1933 server = self.GetCodereviewServer()
1934 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1935 # /c/ is automatically added by short URL server.
1936 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1937 self.GetIssue())
1938 else:
1939 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1940
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001941 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001942 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001943 tag = comment.get('tag', '')
1944 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001945 continue
1946 key = (comment['author']['email'], comment['updated'])
1947 if comment.get('side', 'REVISION') == 'PARENT':
1948 patchset = 'Base'
1949 else:
1950 patchset = 'PS%d' % comment['patch_set']
1951 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001952 url = ('%s/%s/%s#%s%s' %
1953 (url_prefix, comment['patch_set'], path,
1954 'b' if comment.get('side') == 'PARENT' else '',
1955 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001956 comments[key][path][patchset][line] = (url, comment['message'])
1957
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001959 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001960 summary = self._BuildCommentSummary(msg, comments, readable)
1961 if summary:
1962 summaries.append(summary)
1963 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001964
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001965 @staticmethod
1966 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001967 if 'email' not in msg['author']:
1968 # Some bot accounts may not have an email associated.
1969 return None
1970
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001971 key = (msg['author']['email'], msg['date'])
1972 # Don't bother showing autogenerated messages that don't have associated
1973 # file or line comments. this will filter out most autogenerated
1974 # messages, but will keep robot comments like those from Tricium.
1975 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1976 if is_autogenerated and not comments.get(key):
1977 return None
1978 message = msg['message']
1979 # Gerrit spits out nanoseconds.
1980 assert len(msg['date'].split('.')[-1]) == 9
1981 date = datetime.datetime.strptime(msg['date'][:-3],
1982 '%Y-%m-%d %H:%M:%S.%f')
1983 if key in comments:
1984 message += '\n'
1985 for path, patchsets in sorted(comments.get(key, {}).items()):
1986 if readable:
1987 message += '\n%s' % path
1988 for patchset, lines in sorted(patchsets.items()):
1989 for line, (url, content) in sorted(lines.items()):
1990 if line:
1991 line_str = 'Line %d' % line
1992 path_str = '%s:%d:' % (path, line)
1993 else:
1994 line_str = 'File comment'
1995 path_str = '%s:0:' % path
1996 if readable:
1997 message += '\n %s, %s: %s' % (patchset, line_str, url)
1998 message += '\n %s\n' % content
1999 else:
2000 message += '\n%s ' % path_str
2001 message += '\n%s\n' % content
2002
2003 return _CommentSummary(
2004 date=date,
2005 message=message,
2006 sender=msg['author']['email'],
2007 autogenerated=is_autogenerated,
2008 # These could be inferred from the text messages and correlated with
2009 # Code-Review label maximum, however this is not reliable.
2010 # Leaving as is until the need arises.
2011 approval=False,
2012 disapproval=False,
2013 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002014
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002015 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002016 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002017 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002019 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002020 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002021 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002022
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002023 def _GetChangeDetail(self, options=None):
2024 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002025 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002026 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002027
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002028 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002029 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002030 options.append('CURRENT_COMMIT')
2031
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002032 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002033 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002034 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002035
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002036 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2037 # Assumption: data fetched before with extra options is suitable
2038 # for return for a smaller set of options.
2039 # For example, if we cached data for
2040 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2041 # and request is for options=[CURRENT_REVISION],
2042 # THEN we can return prior cached data.
2043 if options_set.issubset(cached_options_set):
2044 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002045
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002046 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002047 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002048 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002049 except gerrit_util.GerritError as e:
2050 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002051 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002052 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002053
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002054 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002055 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002056
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002057 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002058 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002059 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002060 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002061 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002062 except gerrit_util.GerritError as e:
2063 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002064 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002065 raise
agable32978d92016-11-01 12:55:02 -07002066 return data
2067
Karen Qian40c19422019-03-13 21:28:29 +00002068 def _IsCqConfigured(self):
2069 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002070 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002071
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002072 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002073 if git_common.is_dirty_git_tree('land'):
2074 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002075
tandriid60367b2016-06-22 05:25:12 -07002076 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002077 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002078 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002079 'which can test and land changes for you. '
2080 'Are you sure you wish to bypass it?\n',
2081 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002082 differs = True
tandriic4344b52016-08-29 06:04:54 -07002083 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002084 # Note: git diff outputs nothing if there is no diff.
2085 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002086 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002087 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002088 if detail['current_revision'] == last_upload:
2089 differs = False
2090 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002091 print('WARNING: Local branch contents differ from latest uploaded '
2092 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002093 if differs:
2094 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002095 confirm_or_exit(
2096 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2097 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002098 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002099 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002100 upstream = self.GetCommonAncestorWithUpstream()
2101 if self.GetIssue():
2102 description = self.FetchDescription()
2103 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002104 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002105 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 committing=True,
2107 may_prompt=not force,
2108 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002109 parallel=parallel,
2110 upstream=upstream,
2111 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002112 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002113 resultdb=resultdb,
2114 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002115
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002116 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002118 links = self._GetChangeCommit().get('web_links', [])
2119 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002120 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002121 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002122 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002123 return 0
2124
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002125 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2126 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 assert parsed_issue_arg.valid
2128
Edward Lemur125d60a2019-09-13 18:25:41 +00002129 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130
2131 if parsed_issue_arg.hostname:
2132 self._gerrit_host = parsed_issue_arg.hostname
2133 self._gerrit_server = 'https://%s' % self._gerrit_host
2134
tandriic2405f52016-10-10 08:13:15 -07002135 try:
2136 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002137 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002138 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002139
2140 if not parsed_issue_arg.patchset:
2141 # Use current revision by default.
2142 revision_info = detail['revisions'][detail['current_revision']]
2143 patchset = int(revision_info['_number'])
2144 else:
2145 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002146 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2148 break
2149 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002150 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 (parsed_issue_arg.patchset, self.GetIssue()))
2152
Edward Lemur125d60a2019-09-13 18:25:41 +00002153 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002154 if remote_url.endswith('.git'):
2155 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002156 remote_url = remote_url.rstrip('/')
2157
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002159 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002160
2161 if remote_url != fetch_info['url']:
2162 DieWithError('Trying to patch a change from %s but this repo appears '
2163 'to be %s.' % (fetch_info['url'], remote_url))
2164
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002166
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002167 # If we have created a new branch then do the "set issue" immediately in
2168 # case the cherry-pick fails, which happens when resolving conflicts.
2169 if newbranch:
2170 self.SetIssue(parsed_issue_arg.issue)
2171
Aaron Gable62619a32017-06-16 08:22:09 -07002172 if force:
2173 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2174 print('Checked out commit for change %i patchset %i locally' %
2175 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002176 elif nocommit:
2177 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2178 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002179 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002180 RunGit(['cherry-pick', 'FETCH_HEAD'])
2181 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002182 (parsed_issue_arg.issue, patchset))
2183 print('Note: this created a local commit which does not have '
2184 'the same hash as the one uploaded for review. This will make '
2185 'uploading changes based on top of this branch difficult.\n'
2186 'If you want to do that, use "git cl patch --force" instead.')
2187
Stefan Zagerd08043c2017-10-12 12:07:02 -07002188 if self.GetBranch():
2189 self.SetIssue(parsed_issue_arg.issue)
2190 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002191 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002192 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2193 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2194 else:
2195 print('WARNING: You are in detached HEAD state.\n'
2196 'The patch has been applied to your checkout, but you will not be '
2197 'able to upload a new patch set to the gerrit issue.\n'
2198 'Try using the \'-b\' option if you would like to work on a '
2199 'branch and/or upload a new patch set.')
2200
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 return 0
2202
tandrii16e0b4e2016-06-07 10:34:28 -07002203 def _GerritCommitMsgHookCheck(self, offer_removal):
2204 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2205 if not os.path.exists(hook):
2206 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002207 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2208 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002209 data = gclient_utils.FileRead(hook)
2210 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2211 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002212 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002213 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002214 'and may interfere with it in subtle ways.\n'
2215 'We recommend you remove the commit-msg hook.')
2216 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002217 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002218 gclient_utils.rm_file_or_tree(hook)
2219 print('Gerrit commit-msg hook removed.')
2220 else:
2221 print('OK, will keep Gerrit commit-msg hook in place.')
2222
Edward Lemur1b52d872019-05-09 21:12:12 +00002223 def _CleanUpOldTraces(self):
2224 """Keep only the last |MAX_TRACES| traces."""
2225 try:
2226 traces = sorted([
2227 os.path.join(TRACES_DIR, f)
2228 for f in os.listdir(TRACES_DIR)
2229 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2230 and not f.startswith('tmp'))
2231 ])
2232 traces_to_delete = traces[:-MAX_TRACES]
2233 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002234 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002235 except OSError:
2236 print('WARNING: Failed to remove old git traces from\n'
2237 ' %s'
2238 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002239
Edward Lemur5737f022019-05-17 01:24:00 +00002240 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002241 """Zip and write the git push traces stored in traces_dir."""
2242 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002243 traces_zip = trace_name + '-traces'
2244 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002245 # Create a temporary dir to store git config and gitcookies in. It will be
2246 # compressed and stored next to the traces.
2247 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002248 git_info_zip = trace_name + '-git-info'
2249
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002250 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002251
Edward Lemur1b52d872019-05-09 21:12:12 +00002252 git_push_metadata['trace_name'] = trace_name
2253 gclient_utils.FileWrite(
2254 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2255
2256 # Keep only the first 6 characters of the git hashes on the packet
2257 # trace. This greatly decreases size after compression.
2258 packet_traces = os.path.join(traces_dir, 'trace-packet')
2259 if os.path.isfile(packet_traces):
2260 contents = gclient_utils.FileRead(packet_traces)
2261 gclient_utils.FileWrite(
2262 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2263 shutil.make_archive(traces_zip, 'zip', traces_dir)
2264
2265 # Collect and compress the git config and gitcookies.
2266 git_config = RunGit(['config', '-l'])
2267 gclient_utils.FileWrite(
2268 os.path.join(git_info_dir, 'git-config'),
2269 git_config)
2270
2271 cookie_auth = gerrit_util.Authenticator.get()
2272 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2273 gitcookies_path = cookie_auth.get_gitcookies_path()
2274 if os.path.isfile(gitcookies_path):
2275 gitcookies = gclient_utils.FileRead(gitcookies_path)
2276 gclient_utils.FileWrite(
2277 os.path.join(git_info_dir, 'gitcookies'),
2278 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2279 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2280
Edward Lemur1b52d872019-05-09 21:12:12 +00002281 gclient_utils.rmtree(git_info_dir)
2282
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002283 def _RunGitPushWithTraces(self,
2284 refspec,
2285 refspec_opts,
2286 git_push_metadata,
2287 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002288 """Run git push and collect the traces resulting from the execution."""
2289 # Create a temporary directory to store traces in. Traces will be compressed
2290 # and stored in a 'traces' dir inside depot_tools.
2291 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002292 trace_name = os.path.join(
2293 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002294
2295 env = os.environ.copy()
2296 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2297 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002298 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002299 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2300 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2301 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2302
2303 try:
2304 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002305 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002306 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002307 push_cmd = ['git', 'push', remote_url, refspec]
2308 if git_push_options:
2309 for opt in git_push_options:
2310 push_cmd.extend(['-o', opt])
2311
Edward Lemur0f58ae42019-04-30 17:24:12 +00002312 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002313 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002314 env=env,
2315 print_stdout=True,
2316 # Flush after every line: useful for seeing progress when running as
2317 # recipe.
2318 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002319 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002320 except subprocess2.CalledProcessError as e:
2321 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002322 if 'blocked keyword' in str(e.stdout):
2323 raise GitPushError(
2324 'Failed to create a change, very likely due to blocked keyword. '
2325 'Please examine output above for the reason of the failure.\n'
2326 'If this is a false positive, you can try to bypass blocked '
2327 'keyword by using push option '
2328 '-o uploadvalidator~skip, e.g.:\n'
2329 'git cl upload -o uploadvalidator~skip\n\n'
2330 'If git-cl is not working correctly, file a bug under the '
2331 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002332 if 'git push -o nokeycheck' in str(e.stdout):
2333 raise GitPushError(
2334 'Failed to create a change, very likely due to a private key being '
2335 'detected. Please examine output above for the reason of the '
2336 'failure.\n'
2337 'If this is a false positive, you can try to bypass private key '
2338 'detection by using push option '
2339 '-o nokeycheck, e.g.:\n'
2340 'git cl upload -o nokeycheck\n\n'
2341 'If git-cl is not working correctly, file a bug under the '
2342 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002343
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002344 raise GitPushError(
2345 'Failed to create a change. Please examine output above for the '
2346 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002347 'For emergencies, Googlers can escalate to '
2348 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002349 'Hint: run command below to diagnose common Git/Gerrit '
2350 'credential problems:\n'
2351 ' git cl creds-check\n'
2352 '\n'
2353 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2354 'component including the files below.\n'
2355 'Review the files before upload, since they might contain sensitive '
2356 'information.\n'
2357 'Set the Restrict-View-Google label so that they are not publicly '
2358 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002359 finally:
2360 execution_time = time_time() - before_push
2361 metrics.collector.add_repeated('sub_commands', {
2362 'command': 'git push',
2363 'execution_time': execution_time,
2364 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002365 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002366 })
2367
Edward Lemur1b52d872019-05-09 21:12:12 +00002368 git_push_metadata['execution_time'] = execution_time
2369 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002370 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002371
Edward Lemur1b52d872019-05-09 21:12:12 +00002372 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002373 gclient_utils.rmtree(traces_dir)
2374
2375 return push_stdout
2376
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002377 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2378 change_desc):
2379 """Upload the current branch to Gerrit, retry if new remote HEAD is
2380 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002381 remote, remote_branch = self.GetRemoteBranch()
2382 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2383
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002384 try:
2385 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002386 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002387 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002388 # Repository might be in the middle of transition to main branch as
2389 # default, and uploads to old default might be blocked.
2390 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002391 DieWithError(str(e), change_desc)
2392
Josip Sokcevicb631a882021-01-06 18:18:10 +00002393 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2394 self.GetGerritProject())
2395 if project_head == branch:
2396 DieWithError(str(e), change_desc)
2397 branch = project_head
2398
2399 print("WARNING: Fetching remote state and retrying upload to default "
2400 "branch...")
2401 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002402 options.edit_description = False
2403 options.force = True
2404 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002405 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2406 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002407 except GitPushError as e:
2408 DieWithError(str(e), change_desc)
2409
2410 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002411 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002412 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002413 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002414 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002415 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002416 # User requested to change description
2417 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002418 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002419 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002420 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002421 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002422 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002423 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002424 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002425 if len(change_ids) == 1:
2426 change_id = change_ids[0]
2427 else:
2428 change_id = GenerateGerritChangeId(change_desc.description)
2429 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002431 if options.preserve_tryjobs:
2432 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002433
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002434 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002435 parent = self._ComputeParent(
2436 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002437 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002438 with gclient_utils.temporary_file() as desc_tempfile:
2439 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2440 ref_to_push = RunGit(
2441 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002442 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002443 if options.no_add_changeid:
2444 pass
2445 else: # adding Change-Ids is okay.
2446 if not git_footers.get_footer_change_id(change_desc.description):
2447 DownloadGerritHook(False)
2448 change_desc.set_description(
2449 self._AddChangeIdToCommitMessage(change_desc.description,
2450 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002451 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002452 # For no-squash mode, we assume the remote called "origin" is the one we
2453 # want. It is not worthwhile to support different workflows for
2454 # no-squash mode.
2455 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002456 # attempt to extract the changeid from the current description
2457 # fail informatively if not possible.
2458 change_id_candidates = git_footers.get_footer_change_id(
2459 change_desc.description)
2460 if not change_id_candidates:
2461 DieWithError("Unable to extract change-id from message.")
2462 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002464 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002465 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2466 ref_to_push)]).splitlines()
2467 if len(commits) > 1:
2468 print('WARNING: This will upload %d commits. Run the following command '
2469 'to see which commits will be uploaded: ' % len(commits))
2470 print('git log %s..%s' % (parent, ref_to_push))
2471 print('You can also use `git squash-branch` to squash these into a '
2472 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002473 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002474
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002475 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002476 cc = []
2477 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2478 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2479 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002480 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002481 if len(cc) > 100:
2482 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2483 'process/lsc/lsc_workflow.md')
2484 print('WARNING: This will auto-CC %s users.' % len(cc))
2485 print('LSC may be more appropriate: %s' % lsc)
2486 print('You can also use the --no-autocc flag to disable auto-CC.')
2487 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002488 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002489 if options.cc:
2490 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002491 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002492 if change_desc.get_cced():
2493 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002494 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002495 valid_accounts = set(reviewers + cc)
2496 # TODO(crbug/877717): relax this for all hosts.
2497 else:
2498 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002499 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002500 logging.info('accounts %s are recognized, %s invalid',
2501 sorted(valid_accounts),
2502 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002503
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002504 # Extra options that can be specified at push time. Doc:
2505 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002506 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002507
Aaron Gable844cf292017-06-28 11:32:59 -07002508 # By default, new changes are started in WIP mode, and subsequent patchsets
2509 # don't send email. At any time, passing --send-mail will mark the change
2510 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002511 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002512 refspec_opts.append('ready')
2513 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002514 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002515 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002516 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002517 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002518
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002519 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002520 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002521
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002522 # Set options.title in case user was prompted in _GetTitleForUpload and
2523 # _CMDUploadChange needs to be called again.
2524 options.title = self._GetTitleForUpload(options)
2525 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002526 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002527 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002528 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002529
agablec6787972016-09-09 16:13:34 -07002530 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002531 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002532
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002533 for r in sorted(reviewers):
2534 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002535 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002536 reviewers.remove(r)
2537 else:
2538 # TODO(tandrii): this should probably be a hard failure.
2539 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2540 % r)
2541 for c in sorted(cc):
2542 # refspec option will be rejected if cc doesn't correspond to an
2543 # account, even though REST call to add such arbitrary cc may succeed.
2544 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002545 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002546 cc.remove(c)
2547
rmistry9eadede2016-09-19 11:22:43 -07002548 if options.topic:
2549 # Documentation on Gerrit topics is here:
2550 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002551 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002552
Edward Lemur687ca902018-12-05 02:30:30 +00002553 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002554 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002555 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002556 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002557 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002558 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002559 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002560 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002561 elif options.cq_quick_run:
2562 refspec_opts.append('l=Commit-Queue+1')
2563 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002564
2565 if change_desc.get_reviewers(tbr_only=True):
2566 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002567 self.GetGerritHost(),
2568 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002569 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002570
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002571 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002572 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002573 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002574 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002575 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2576
2577 refspec_suffix = ''
2578 if refspec_opts:
2579 refspec_suffix = '%' + ','.join(refspec_opts)
2580 assert ' ' not in refspec_suffix, (
2581 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2582 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002583
Edward Lemur1b52d872019-05-09 21:12:12 +00002584 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002585 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002586 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002587 'change_id': change_id,
2588 'description': change_desc.description,
2589 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002590
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002591 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002592 git_push_metadata,
2593 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002594
2595 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002596 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002597 change_numbers = [m.group(1)
2598 for m in map(regex.match, push_stdout.splitlines())
2599 if m]
2600 if len(change_numbers) != 1:
2601 DieWithError(
2602 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002603 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002604 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002605 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002606
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002607 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002608 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002609 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002610 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002611 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002612 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002613 reviewers, cc,
2614 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002615
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002616 return 0
2617
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002618 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2619 change_desc):
2620 """Computes parent of the generated commit to be uploaded to Gerrit.
2621
2622 Returns revision or a ref name.
2623 """
2624 if custom_cl_base:
2625 # Try to avoid creating additional unintended CLs when uploading, unless
2626 # user wants to take this risk.
2627 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2628 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2629 local_ref_of_target_remote])
2630 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002631 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002632 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2633 'If you proceed with upload, more than 1 CL may be created by '
2634 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2635 'If you are certain that specified base `%s` has already been '
2636 'uploaded to Gerrit as another CL, you may proceed.\n' %
2637 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2638 if not force:
2639 confirm_or_exit(
2640 'Do you take responsibility for cleaning up potential mess '
2641 'resulting from proceeding with upload?',
2642 action='upload')
2643 return custom_cl_base
2644
Aaron Gablef97e33d2017-03-30 15:44:27 -07002645 if remote != '.':
2646 return self.GetCommonAncestorWithUpstream()
2647
2648 # If our upstream branch is local, we base our squashed commit on its
2649 # squashed version.
2650 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2651
Aaron Gablef97e33d2017-03-30 15:44:27 -07002652 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002653 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002654 if upstream_branch_name == 'main':
2655 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002656
2657 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002658 # TODO(tandrii): consider checking parent change in Gerrit and using its
2659 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2660 # the tree hash of the parent branch. The upside is less likely bogus
2661 # requests to reupload parent change just because it's uploadhash is
2662 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002663 parent = scm.GIT.GetBranchConfig(
2664 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002665 # Verify that the upstream branch has been uploaded too, otherwise
2666 # Gerrit will create additional CLs when uploading.
2667 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2668 RunGitSilent(['rev-parse', parent + ':'])):
2669 DieWithError(
2670 '\nUpload upstream branch %s first.\n'
2671 'It is likely that this branch has been rebased since its last '
2672 'upload, so you just need to upload it again.\n'
2673 '(If you uploaded it with --no-squash, then branch dependencies '
2674 'are not supported, and you should reupload with --squash.)'
2675 % upstream_branch_name,
2676 change_desc)
2677 return parent
2678
Edward Lemura12175c2020-03-09 16:58:26 +00002679 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002680 """Re-commits using the current message, assumes the commit hook is in
2681 place.
2682 """
Edward Lemura12175c2020-03-09 16:58:26 +00002683 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002684 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002685 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002686 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002687 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002688
2689 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002690
tandriie113dfd2016-10-11 10:20:12 -07002691 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002692 try:
2693 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002694 except GerritChangeNotExists:
2695 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002696
2697 if data['status'] in ('ABANDONED', 'MERGED'):
2698 return 'CL %s is closed' % self.GetIssue()
2699
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002700 def GetGerritChange(self, patchset=None):
2701 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002702 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002703 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002704 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002705 data = self._GetChangeDetail(['ALL_REVISIONS'])
2706
2707 assert host and issue and patchset, 'CL must be uploaded first'
2708
2709 has_patchset = any(
2710 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002711 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002712 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002713 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002714 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002715
tandrii8c5a3532016-11-04 07:52:02 -07002716 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002717 'host': host,
2718 'change': issue,
2719 'project': data['project'],
2720 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002721 }
tandriie113dfd2016-10-11 10:20:12 -07002722
tandriide281ae2016-10-12 06:02:30 -07002723 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002724 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002725
Edward Lemur707d70b2018-02-07 00:50:14 +01002726 def GetReviewers(self):
2727 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002728 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002729
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002730
Lei Zhang8a0efc12020-08-05 19:58:45 +00002731def _get_bug_line_values(default_project_prefix, bugs):
2732 """Given default_project_prefix and comma separated list of bugs, yields bug
2733 line values.
tandriif9aefb72016-07-01 09:06:51 -07002734
2735 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002736 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002737 * string, which is left as is.
2738
2739 This function may produce more than one line, because bugdroid expects one
2740 project per line.
2741
Lei Zhang8a0efc12020-08-05 19:58:45 +00002742 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002743 ['v8:123', 'chromium:789']
2744 """
2745 default_bugs = []
2746 others = []
2747 for bug in bugs.split(','):
2748 bug = bug.strip()
2749 if bug:
2750 try:
2751 default_bugs.append(int(bug))
2752 except ValueError:
2753 others.append(bug)
2754
2755 if default_bugs:
2756 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002757 if default_project_prefix:
2758 if not default_project_prefix.endswith(':'):
2759 default_project_prefix += ':'
2760 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002761 else:
2762 yield default_bugs
2763 for other in sorted(others):
2764 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2765 yield other
2766
2767
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002768class ChangeDescription(object):
2769 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002770 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002771 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002772 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002773 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002774 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002775 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2776 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002777 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002778 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002779
Dan Beamd8b04ca2019-10-10 21:23:26 +00002780 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002781 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002782 if bug:
2783 regexp = re.compile(self.BUG_LINE)
2784 prefix = settings.GetBugPrefix()
2785 if not any((regexp.match(line) for line in self._description_lines)):
2786 values = list(_get_bug_line_values(prefix, bug))
2787 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002788 if fixed:
2789 regexp = re.compile(self.FIXED_LINE)
2790 prefix = settings.GetBugPrefix()
2791 if not any((regexp.match(line) for line in self._description_lines)):
2792 values = list(_get_bug_line_values(prefix, fixed))
2793 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002794
agable@chromium.org42c20792013-09-12 17:34:49 +00002795 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002796 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002797 return '\n'.join(self._description_lines)
2798
2799 def set_description(self, desc):
2800 if isinstance(desc, basestring):
2801 lines = desc.splitlines()
2802 else:
2803 lines = [line.rstrip() for line in desc]
2804 while lines and not lines[0]:
2805 lines.pop(0)
2806 while lines and not lines[-1]:
2807 lines.pop(-1)
2808 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002809
Edward Lemur5a644f82020-03-18 16:44:57 +00002810 def ensure_change_id(self, change_id):
2811 description = self.description
2812 footer_change_ids = git_footers.get_footer_change_id(description)
2813 # Make sure that the Change-Id in the description matches the given one.
2814 if footer_change_ids != [change_id]:
2815 if footer_change_ids:
2816 # Remove any existing Change-Id footers since they don't match the
2817 # expected change_id footer.
2818 description = git_footers.remove_footer(description, 'Change-Id')
2819 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2820 'if you want to set a new one.')
2821 # Add the expected Change-Id footer.
2822 description = git_footers.add_footer_change_id(description, change_id)
2823 self.set_description(description)
2824
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002825 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002826 """Rewrites the R=/TBR= line(s) as a single line each.
2827
2828 Args:
2829 reviewers (list(str)) - list of additional emails to use for reviewers.
2830 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002831 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002832 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002833 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002834
2835 reviewers = set(reviewers)
2836 tbrs = set(tbrs)
2837 LOOKUP = {
2838 'TBR': tbrs,
2839 'R': reviewers,
2840 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002841
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002842 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 regexp = re.compile(self.R_LINE)
2844 matches = [regexp.match(line) for line in self._description_lines]
2845 new_desc = [l for i, l in enumerate(self._description_lines)
2846 if not matches[i]]
2847 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002848
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002850
2851 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002852 for match in matches:
2853 if not match:
2854 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002855 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2856
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002857 # If any folks ended up in both groups, remove them from tbrs.
2858 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002859
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002860 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2861 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002862
2863 # Put the new lines in the description where the old first R= line was.
2864 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2865 if 0 <= line_loc < len(self._description_lines):
2866 if new_tbr_line:
2867 self._description_lines.insert(line_loc, new_tbr_line)
2868 if new_r_line:
2869 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002870 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002871 if new_r_line:
2872 self.append_footer(new_r_line)
2873 if new_tbr_line:
2874 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002875
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002876 def set_preserve_tryjobs(self):
2877 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2878 footers = git_footers.parse_footers(self.description)
2879 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2880 if v.lower() == 'true':
2881 return
2882 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2883
Anthony Polito8b955342019-09-24 19:01:36 +00002884 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002886 self.set_description([
2887 '# Enter a description of the change.',
2888 '# This will be displayed on the codereview site.',
2889 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002890 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002891 '--------------------',
2892 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002893 bug_regexp = re.compile(self.BUG_LINE)
2894 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002895 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002896 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002897
Dan Beamd8b04ca2019-10-10 21:23:26 +00002898 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002899 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002900
Bruce Dawsonfc487042020-10-27 19:11:37 +00002901 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002902 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002903 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002904 if not content:
2905 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002906 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002907
Bruce Dawson2377b012018-01-11 16:46:49 -08002908 # Strip off comments and default inserted "Bug:" line.
2909 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002910 (line.startswith('#') or
2911 line.rstrip() == "Bug:" or
2912 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002913 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002914 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002915 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002916
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002917 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002918 """Adds a footer line to the description.
2919
2920 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2921 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2922 that Gerrit footers are always at the end.
2923 """
2924 parsed_footer_line = git_footers.parse_footer(line)
2925 if parsed_footer_line:
2926 # Line is a gerrit footer in the form: Footer-Key: any value.
2927 # Thus, must be appended observing Gerrit footer rules.
2928 self.set_description(
2929 git_footers.add_footer(self.description,
2930 key=parsed_footer_line[0],
2931 value=parsed_footer_line[1]))
2932 return
2933
2934 if not self._description_lines:
2935 self._description_lines.append(line)
2936 return
2937
2938 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2939 if gerrit_footers:
2940 # git_footers.split_footers ensures that there is an empty line before
2941 # actual (gerrit) footers, if any. We have to keep it that way.
2942 assert top_lines and top_lines[-1] == ''
2943 top_lines, separator = top_lines[:-1], top_lines[-1:]
2944 else:
2945 separator = [] # No need for separator if there are no gerrit_footers.
2946
2947 prev_line = top_lines[-1] if top_lines else ''
2948 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2949 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2950 top_lines.append('')
2951 top_lines.append(line)
2952 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002953
tandrii99a72f22016-08-17 14:33:24 -07002954 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002955 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002956 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002957 reviewers = [match.group(2).strip()
2958 for match in matches
2959 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002960 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002961
bradnelsond975b302016-10-23 12:20:23 -07002962 def get_cced(self):
2963 """Retrieves the list of reviewers."""
2964 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2965 cced = [match.group(2).strip() for match in matches if match]
2966 return cleanup_list(cced)
2967
Nodir Turakulov23b82142017-11-16 11:04:25 -08002968 def get_hash_tags(self):
2969 """Extracts and sanitizes a list of Gerrit hashtags."""
2970 subject = (self._description_lines or ('',))[0]
2971 subject = re.sub(
2972 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2973
2974 tags = []
2975 start = 0
2976 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2977 while True:
2978 m = bracket_exp.match(subject, start)
2979 if not m:
2980 break
2981 tags.append(self.sanitize_hash_tag(m.group(1)))
2982 start = m.end()
2983
2984 if not tags:
2985 # Try "Tag: " prefix.
2986 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2987 if m:
2988 tags.append(self.sanitize_hash_tag(m.group(1)))
2989 return tags
2990
2991 @classmethod
2992 def sanitize_hash_tag(cls, tag):
2993 """Returns a sanitized Gerrit hash tag.
2994
2995 A sanitized hashtag can be used as a git push refspec parameter value.
2996 """
2997 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2998
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002999
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003000def FindCodereviewSettingsFile(filename='codereview.settings'):
3001 """Finds the given file starting in the cwd and going up.
3002
3003 Only looks up to the top of the repository unless an
3004 'inherit-review-settings-ok' file exists in the root of the repository.
3005 """
3006 inherit_ok_file = 'inherit-review-settings-ok'
3007 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003008 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003009 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003010 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003011 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003012 if os.path.isfile(os.path.join(cwd, filename)):
3013 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003014 if cwd == root:
3015 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003016 parent_dir = os.path.dirname(cwd)
3017 if parent_dir == cwd:
3018 # We hit the system root directory.
3019 break
3020 cwd = parent_dir
3021 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003022
3023
3024def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003025 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003026 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003027
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003028 def SetProperty(name, setting, unset_error_ok=False):
3029 fullname = 'rietveld.' + name
3030 if setting in keyvals:
3031 RunGit(['config', fullname, keyvals[setting]])
3032 else:
3033 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3034
tandrii48df5812016-10-17 03:55:37 -07003035 if not keyvals.get('GERRIT_HOST', False):
3036 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003037 # Only server setting is required. Other settings can be absent.
3038 # In that case, we ignore errors raised during option deletion attempt.
3039 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3040 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3041 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003042 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003043 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3044 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003045 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3046 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003047 SetProperty(
3048 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003049 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003050
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003051 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003052 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003053
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003054 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003055 RunGit(['config', 'gerrit.squash-uploads',
3056 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003057
tandrii@chromium.org28253532016-04-14 13:46:56 +00003058 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003059 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003060 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3061
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003062 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003063 # should be of the form
3064 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3065 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003066 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3067 keyvals['ORIGIN_URL_CONFIG']])
3068
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003069
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003070def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003071 """Downloads a network object to a local file, like urllib.urlretrieve.
3072
3073 This is necessary because urllib is broken for SSL connections via a proxy.
3074 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003075 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003076 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003077
3078
ukai@chromium.org712d6102013-11-27 00:52:58 +00003079def hasSheBang(fname):
3080 """Checks fname is a #! script."""
3081 with open(fname) as f:
3082 return f.read(2).startswith('#!')
3083
3084
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003085def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003086 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003087
3088 Args:
3089 force: True to update hooks. False to install hooks if not present.
3090 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003091 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003092 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3093 if not os.access(dst, os.X_OK):
3094 if os.path.exists(dst):
3095 if not force:
3096 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003097 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003098 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003099 if not hasSheBang(dst):
3100 DieWithError('Not a script: %s\n'
3101 'You need to download from\n%s\n'
3102 'into .git/hooks/commit-msg and '
3103 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003104 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3105 except Exception:
3106 if os.path.exists(dst):
3107 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003108 DieWithError('\nFailed to download hooks.\n'
3109 'You need to download from\n%s\n'
3110 'into .git/hooks/commit-msg and '
3111 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003112
3113
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003114class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003115 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003116
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003117 _GOOGLESOURCE = 'googlesource.com'
3118
3119 def __init__(self):
3120 # Cached list of [host, identity, source], where source is either
3121 # .gitcookies or .netrc.
3122 self._all_hosts = None
3123
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003124 def ensure_configured_gitcookies(self):
3125 """Runs checks and suggests fixes to make git use .gitcookies from default
3126 path."""
3127 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3128 configured_path = RunGitSilent(
3129 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003130 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003131 if configured_path:
3132 self._ensure_default_gitcookies_path(configured_path, default)
3133 else:
3134 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003135
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003136 @staticmethod
3137 def _ensure_default_gitcookies_path(configured_path, default_path):
3138 assert configured_path
3139 if configured_path == default_path:
3140 print('git is already configured to use your .gitcookies from %s' %
3141 configured_path)
3142 return
3143
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003144 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003145 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3146 (configured_path, default_path))
3147
3148 if not os.path.exists(configured_path):
3149 print('However, your configured .gitcookies file is missing.')
3150 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3151 action='reconfigure')
3152 RunGit(['config', '--global', 'http.cookiefile', default_path])
3153 return
3154
3155 if os.path.exists(default_path):
3156 print('WARNING: default .gitcookies file already exists %s' %
3157 default_path)
3158 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3159 default_path)
3160
3161 confirm_or_exit('Move existing .gitcookies to default location?',
3162 action='move')
3163 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003164 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003165 print('Moved and reconfigured git to use .gitcookies from %s' %
3166 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003167
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003168 @staticmethod
3169 def _configure_gitcookies_path(default_path):
3170 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3171 if os.path.exists(netrc_path):
3172 print('You seem to be using outdated .netrc for git credentials: %s' %
3173 netrc_path)
3174 print('This tool will guide you through setting up recommended '
3175 '.gitcookies store for git credentials.\n'
3176 '\n'
3177 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3178 ' git config --global --unset http.cookiefile\n'
3179 ' mv %s %s.backup\n\n' % (default_path, default_path))
3180 confirm_or_exit(action='setup .gitcookies')
3181 RunGit(['config', '--global', 'http.cookiefile', default_path])
3182 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003183
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003184 def get_hosts_with_creds(self, include_netrc=False):
3185 if self._all_hosts is None:
3186 a = gerrit_util.CookiesAuthenticator()
3187 self._all_hosts = [
3188 (h, u, s)
3189 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003190 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3191 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003192 )
3193 if h.endswith(self._GOOGLESOURCE)
3194 ]
3195
3196 if include_netrc:
3197 return self._all_hosts
3198 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3199
3200 def print_current_creds(self, include_netrc=False):
3201 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3202 if not hosts:
3203 print('No Git/Gerrit credentials found')
3204 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003205 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003206 header = [('Host', 'User', 'Which file'),
3207 ['=' * l for l in lengths]]
3208 for row in (header + hosts):
3209 print('\t'.join((('%%+%ds' % l) % s)
3210 for l, s in zip(lengths, row)))
3211
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003212 @staticmethod
3213 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003214 """Parses identity "git-<username>.domain" into <username> and domain."""
3215 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003216 # distinguishable from sub-domains. But we do know typical domains:
3217 if identity.endswith('.chromium.org'):
3218 domain = 'chromium.org'
3219 username = identity[:-len('.chromium.org')]
3220 else:
3221 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003222 if username.startswith('git-'):
3223 username = username[len('git-'):]
3224 return username, domain
3225
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003226 def _canonical_git_googlesource_host(self, host):
3227 """Normalizes Gerrit hosts (with '-review') to Git host."""
3228 assert host.endswith(self._GOOGLESOURCE)
3229 # Prefix doesn't include '.' at the end.
3230 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3231 if prefix.endswith('-review'):
3232 prefix = prefix[:-len('-review')]
3233 return prefix + '.' + self._GOOGLESOURCE
3234
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003235 def _canonical_gerrit_googlesource_host(self, host):
3236 git_host = self._canonical_git_googlesource_host(host)
3237 prefix = git_host.split('.', 1)[0]
3238 return prefix + '-review.' + self._GOOGLESOURCE
3239
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003240 def _get_counterpart_host(self, host):
3241 assert host.endswith(self._GOOGLESOURCE)
3242 git = self._canonical_git_googlesource_host(host)
3243 gerrit = self._canonical_gerrit_googlesource_host(git)
3244 return git if gerrit == host else gerrit
3245
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003246 def has_generic_host(self):
3247 """Returns whether generic .googlesource.com has been configured.
3248
3249 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3250 """
3251 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3252 if host == '.' + self._GOOGLESOURCE:
3253 return True
3254 return False
3255
3256 def _get_git_gerrit_identity_pairs(self):
3257 """Returns map from canonic host to pair of identities (Git, Gerrit).
3258
3259 One of identities might be None, meaning not configured.
3260 """
3261 host_to_identity_pairs = {}
3262 for host, identity, _ in self.get_hosts_with_creds():
3263 canonical = self._canonical_git_googlesource_host(host)
3264 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3265 idx = 0 if canonical == host else 1
3266 pair[idx] = identity
3267 return host_to_identity_pairs
3268
3269 def get_partially_configured_hosts(self):
3270 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003271 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003272 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003273 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003274
3275 def get_conflicting_hosts(self):
3276 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003277 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003278 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003279 if None not in (i1, i2) and i1 != i2)
3280
3281 def get_duplicated_hosts(self):
3282 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003283 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003284
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003285
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003286 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003287 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003288 hosts = sorted(hosts)
3289 assert hosts
3290 if extra_column_func is None:
3291 extras = [''] * len(hosts)
3292 else:
3293 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003294 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3295 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003296 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003297 lines.append(tmpl % he)
3298 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003299
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003300 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003301 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003302 yield ('.googlesource.com wildcard record detected',
3303 ['Chrome Infrastructure team recommends to list full host names '
3304 'explicitly.'],
3305 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003306
3307 dups = self.get_duplicated_hosts()
3308 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003309 yield ('The following hosts were defined twice',
3310 self._format_hosts(dups),
3311 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003312
3313 partial = self.get_partially_configured_hosts()
3314 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003315 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3316 'These hosts are missing',
3317 self._format_hosts(partial, lambda host: 'but %s defined' %
3318 self._get_counterpart_host(host)),
3319 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003320
3321 conflicting = self.get_conflicting_hosts()
3322 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003323 yield ('The following Git hosts have differing credentials from their '
3324 'Gerrit counterparts',
3325 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3326 tuple(self._get_git_gerrit_identity_pairs()[host])),
3327 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003328
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003329 def find_and_report_problems(self):
3330 """Returns True if there was at least one problem, else False."""
3331 found = False
3332 bad_hosts = set()
3333 for title, sublines, hosts in self._find_problems():
3334 if not found:
3335 found = True
3336 print('\n\n.gitcookies problem report:\n')
3337 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003338 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003339 if sublines:
3340 print()
3341 print(' %s' % '\n '.join(sublines))
3342 print()
3343
3344 if bad_hosts:
3345 assert found
3346 print(' You can manually remove corresponding lines in your %s file and '
3347 'visit the following URLs with correct account to generate '
3348 'correct credential lines:\n' %
3349 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3350 print(' %s' % '\n '.join(sorted(set(
3351 gerrit_util.CookiesAuthenticator().get_new_password_url(
3352 self._canonical_git_googlesource_host(host))
3353 for host in bad_hosts
3354 ))))
3355 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003356
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003357
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003358@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003359def CMDcreds_check(parser, args):
3360 """Checks credentials and suggests changes."""
3361 _, _ = parser.parse_args(args)
3362
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003363 # Code below checks .gitcookies. Abort if using something else.
3364 authn = gerrit_util.Authenticator.get()
3365 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003366 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003367 'This command is not designed for bot environment. It checks '
3368 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003369 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3370 if isinstance(authn, gerrit_util.GceAuthenticator):
3371 message += (
3372 '\n'
3373 'If you need to run this on GCE or a cloudtop instance, '
3374 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3375 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003376
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003377 checker = _GitCookiesChecker()
3378 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003379
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003380 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003381 checker.print_current_creds(include_netrc=True)
3382
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003383 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003384 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003385 return 0
3386 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003387
3388
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003389@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003390def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003391 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003392 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003393 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003394 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003395 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003396 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003397 return RunGit(['config', 'branch.%s.base-url' % branch],
3398 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003399
3400 print('Setting base-url to %s' % args[0])
3401 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3402 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003403
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003404
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003405def color_for_status(status):
3406 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003407 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003408 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003409 'unsent': BOLD + Fore.YELLOW,
3410 'waiting': BOLD + Fore.RED,
3411 'reply': BOLD + Fore.YELLOW,
3412 'not lgtm': BOLD + Fore.RED,
3413 'lgtm': BOLD + Fore.GREEN,
3414 'commit': BOLD + Fore.MAGENTA,
3415 'closed': BOLD + Fore.CYAN,
3416 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003417 }.get(status, Fore.WHITE)
3418
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003419
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003420def get_cl_statuses(changes, fine_grained, max_processes=None):
3421 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003422
3423 If fine_grained is true, this will fetch CL statuses from the server.
3424 Otherwise, simply indicate if there's a matching url for the given branches.
3425
3426 If max_processes is specified, it is used as the maximum number of processes
3427 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3428 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003429
3430 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003431 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003432 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003433 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003434
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003435 if not fine_grained:
3436 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003437 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003438 for cl in changes:
3439 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003440 return
3441
3442 # First, sort out authentication issues.
3443 logging.debug('ensuring credentials exist')
3444 for cl in changes:
3445 cl.EnsureAuthenticated(force=False, refresh=True)
3446
3447 def fetch(cl):
3448 try:
3449 return (cl, cl.GetStatus())
3450 except:
3451 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003452 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003453 raise
3454
3455 threads_count = len(changes)
3456 if max_processes:
3457 threads_count = max(1, min(threads_count, max_processes))
3458 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3459
Edward Lemur61bf4172020-02-24 23:22:37 +00003460 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003461 fetched_cls = set()
3462 try:
3463 it = pool.imap_unordered(fetch, changes).__iter__()
3464 while True:
3465 try:
3466 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003467 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003468 break
3469 fetched_cls.add(cl)
3470 yield cl, status
3471 finally:
3472 pool.close()
3473
3474 # Add any branches that failed to fetch.
3475 for cl in set(changes) - fetched_cls:
3476 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003477
rmistry@google.com2dd99862015-06-22 12:22:18 +00003478
Jose Lopes3863fc52020-04-07 17:00:25 +00003479def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003480 """Uploads CLs of local branches that are dependents of the current branch.
3481
3482 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003483
3484 test1 -> test2.1 -> test3.1
3485 -> test3.2
3486 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003487
3488 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3489 run on the dependent branches in this order:
3490 test2.1, test3.1, test3.2, test2.2, test3.3
3491
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003492 Note: This function does not rebase your local dependent branches. Use it
3493 when you make a change to the parent branch that will not conflict
3494 with its dependent branches, and you would like their dependencies
3495 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003496 """
3497 if git_common.is_dirty_git_tree('upload-branch-deps'):
3498 return 1
3499
3500 root_branch = cl.GetBranch()
3501 if root_branch is None:
3502 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3503 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003504 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003505 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3506 'patchset dependencies without an uploaded CL.')
3507
3508 branches = RunGit(['for-each-ref',
3509 '--format=%(refname:short) %(upstream:short)',
3510 'refs/heads'])
3511 if not branches:
3512 print('No local branches found.')
3513 return 0
3514
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003515 # Create a dictionary of all local branches to the branches that are
3516 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003517 tracked_to_dependents = collections.defaultdict(list)
3518 for b in branches.splitlines():
3519 tokens = b.split()
3520 if len(tokens) == 2:
3521 branch_name, tracked = tokens
3522 tracked_to_dependents[tracked].append(branch_name)
3523
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print()
3525 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003526 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003527
rmistry@google.com2dd99862015-06-22 12:22:18 +00003528 def traverse_dependents_preorder(branch, padding=''):
3529 dependents_to_process = tracked_to_dependents.get(branch, [])
3530 padding += ' '
3531 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003532 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533 dependents.append(dependent)
3534 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003535
rmistry@google.com2dd99862015-06-22 12:22:18 +00003536 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003537 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003538
3539 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003540 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 return 0
3542
Jose Lopes3863fc52020-04-07 17:00:25 +00003543 if not force:
3544 confirm_or_exit('This command will checkout all dependent branches and run '
3545 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546
rmistry@google.com2dd99862015-06-22 12:22:18 +00003547 # Record all dependents that failed to upload.
3548 failures = {}
3549 # Go through all dependents, checkout the branch and upload.
3550 try:
3551 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003552 print()
3553 print('--------------------------------------')
3554 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003555 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003556 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003557 try:
3558 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003559 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003561 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003562 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003563 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003564 finally:
3565 # Swap back to the original root branch.
3566 RunGit(['checkout', '-q', root_branch])
3567
vapiera7fbd5a2016-06-16 09:17:49 -07003568 print()
3569 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003570 for dependent_branch in dependents:
3571 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003572 print(' %s : %s' % (dependent_branch, upload_status))
3573 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003574
3575 return 0
3576
3577
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003578def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003579 """Given a proposed tag name, returns a tag name that is guaranteed to be
3580 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3581 or 'foo-3', and so on."""
3582
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003583 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003584 for suffix_num in itertools.count(1):
3585 if suffix_num == 1:
3586 to_check = proposed_tag
3587 else:
3588 to_check = '%s-%d' % (proposed_tag, suffix_num)
3589
3590 if to_check not in existing_tags:
3591 return to_check
3592
3593
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003594@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003595def CMDarchive(parser, args):
3596 """Archives and deletes branches associated with closed changelists."""
3597 parser.add_option(
3598 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003599 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003600 parser.add_option(
3601 '-f', '--force', action='store_true',
3602 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003603 parser.add_option(
3604 '-d', '--dry-run', action='store_true',
3605 help='Skip the branch tagging and removal steps.')
3606 parser.add_option(
3607 '-t', '--notags', action='store_true',
3608 help='Do not tag archived branches. '
3609 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003610 parser.add_option(
3611 '-p',
3612 '--pattern',
3613 default='git-cl-archived-{issue}-{branch}',
3614 help='Format string for archive tags. '
3615 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003616
kmarshall3bff56b2016-06-06 18:31:47 -07003617 options, args = parser.parse_args(args)
3618 if args:
3619 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003620
3621 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3622 if not branches:
3623 return 0
3624
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003625 tags = RunGit(['for-each-ref', '--format=%(refname)',
3626 'refs/tags']).splitlines() or []
3627 tags = [t.split('/')[-1] for t in tags]
3628
vapiera7fbd5a2016-06-16 09:17:49 -07003629 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003630 changes = [Changelist(branchref=b)
3631 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003632 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3633 statuses = get_cl_statuses(changes,
3634 fine_grained=True,
3635 max_processes=options.maxjobs)
3636 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003637 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3638 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003639 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003640 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003641 proposal.sort()
3642
3643 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003644 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003645 return 0
3646
Edward Lemur85153282020-02-14 22:06:29 +00003647 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003648
vapiera7fbd5a2016-06-16 09:17:49 -07003649 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003650 if options.notags:
3651 for next_item in proposal:
3652 print(' ' + next_item[0])
3653 else:
3654 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3655 for next_item in proposal:
3656 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003657
kmarshall9249e012016-08-23 12:02:16 -07003658 # Quit now on precondition failure or if instructed by the user, either
3659 # via an interactive prompt or by command line flags.
3660 if options.dry_run:
3661 print('\nNo changes were made (dry run).\n')
3662 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003663
3664 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003665 print('You are currently on a branch \'%s\' which is associated with a '
3666 'closed codereview issue, so archive cannot proceed. Please '
3667 'checkout another branch and run this command again.' %
3668 current_branch)
3669 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003670
3671 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003672 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003673 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003675 return 1
3676
3677 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003678 if not options.notags:
3679 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003680
3681 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3682 # Clean up the tag if we failed to delete the branch.
3683 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003684
vapiera7fbd5a2016-06-16 09:17:49 -07003685 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003686
3687 return 0
3688
3689
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003690@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003691def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003692 """Show status of changelists.
3693
3694 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003695 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003696 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003697 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003698 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003699 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003700 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003701 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003702
3703 Also see 'git cl comments'.
3704 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003705 parser.add_option(
3706 '--no-branch-color',
3707 action='store_true',
3708 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003709 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003710 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003711 parser.add_option('-f', '--fast', action='store_true',
3712 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003713 parser.add_option(
3714 '-j', '--maxjobs', action='store', type=int,
3715 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003716 parser.add_option(
3717 '-i', '--issue', type=int,
3718 help='Operate on this issue instead of the current branch\'s implicit '
3719 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003720 parser.add_option('-d',
3721 '--date-order',
3722 action='store_true',
3723 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003724 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003725 if args:
3726 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003727
iannuccie53c9352016-08-17 14:40:40 -07003728 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003729 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003730
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003731 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003732 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003733 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003734 if cl.GetIssue():
3735 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003736 elif options.field == 'id':
3737 issueid = cl.GetIssue()
3738 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003740 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003741 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003742 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003744 elif options.field == 'status':
3745 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003746 elif options.field == 'url':
3747 url = cl.GetIssueURL()
3748 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003749 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003750 return 0
3751
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003752 branches = RunGit([
3753 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3754 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003755 if not branches:
3756 print('No local branch found.')
3757 return 0
3758
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003759 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003760 Changelist(branchref=b, commit_date=ct)
3761 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3762 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003763 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003764 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003765 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003766 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003767
Edward Lemur85153282020-02-14 22:06:29 +00003768 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003769
3770 def FormatBranchName(branch, colorize=False):
3771 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3772 an asterisk when it is the current branch."""
3773
3774 asterisk = ""
3775 color = Fore.RESET
3776 if branch == current_branch:
3777 asterisk = "* "
3778 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003779 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003780
3781 if colorize:
3782 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003783 return asterisk + branch_name
3784
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003785 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003786
3787 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003788
3789 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003790 sorted_changes = sorted(changes,
3791 key=lambda c: c.GetCommitDate(),
3792 reverse=True)
3793 else:
3794 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3795 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003796 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003797 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003798 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003799 branch_statuses[c.GetBranch()] = status
3800 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003801 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003802 if url and (not status or status == 'error'):
3803 # The issue probably doesn't exist anymore.
3804 url += ' (broken)'
3805
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003806 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003807 # Turn off bold as well as colors.
3808 END = '\033[0m'
3809 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003810 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003811 color = ''
3812 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003813 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003814
Alan Cuttera3be9a52019-03-04 18:50:33 +00003815 branch_display = FormatBranchName(branch)
3816 padding = ' ' * (alignment - len(branch_display))
3817 if not options.no_branch_color:
3818 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003819
Alan Cuttera3be9a52019-03-04 18:50:33 +00003820 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3821 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003822
vapiera7fbd5a2016-06-16 09:17:49 -07003823 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003824 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003825 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003826 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003827 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003828 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003829 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003830 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003831 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003832 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003833 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003834 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003835 return 0
3836
3837
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003838def colorize_CMDstatus_doc():
3839 """To be called once in main() to add colors to git cl status help."""
3840 colors = [i for i in dir(Fore) if i[0].isupper()]
3841
3842 def colorize_line(line):
3843 for color in colors:
3844 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003845 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003846 indent = len(line) - len(line.lstrip(' ')) + 1
3847 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3848 return line
3849
3850 lines = CMDstatus.__doc__.splitlines()
3851 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3852
3853
phajdan.jre328cf92016-08-22 04:12:17 -07003854def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003855 if path == '-':
3856 json.dump(contents, sys.stdout)
3857 else:
3858 with open(path, 'w') as f:
3859 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003860
3861
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003862@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003863@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003864def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003865 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003866
3867 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003868 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003869 parser.add_option('-r', '--reverse', action='store_true',
3870 help='Lookup the branch(es) for the specified issues. If '
3871 'no issues are specified, all branches with mapped '
3872 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003873 parser.add_option('--json',
3874 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003875 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003876
dnj@chromium.org406c4402015-03-03 17:22:28 +00003877 if options.reverse:
3878 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003879 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003880 # Reverse issue lookup.
3881 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003882
3883 git_config = {}
3884 for config in RunGit(['config', '--get-regexp',
3885 r'branch\..*issue']).splitlines():
3886 name, _space, val = config.partition(' ')
3887 git_config[name] = val
3888
dnj@chromium.org406c4402015-03-03 17:22:28 +00003889 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003890 issue = git_config.get(
3891 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003892 if issue:
3893 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003894 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003895 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003896 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003897 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003898 try:
3899 issue_num = int(issue)
3900 except ValueError:
3901 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003902 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003903 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003905 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003906 if options.json:
3907 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003908 return 0
3909
3910 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003911 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003912 if not issue.valid:
3913 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3914 'or no argument to list it.\n'
3915 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003916 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003917 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003918 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003919 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003920 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3921 if options.json:
3922 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003923 'gerrit_host': cl.GetGerritHost(),
3924 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003925 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003926 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003927 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003928 return 0
3929
3930
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003931@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003932def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003933 """Shows or posts review comments for any changelist."""
3934 parser.add_option('-a', '--add-comment', dest='comment',
3935 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003936 parser.add_option('-p', '--publish', action='store_true',
3937 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003938 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003939 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003940 parser.add_option('-m', '--machine-readable', dest='readable',
3941 action='store_false', default=True,
3942 help='output comments in a format compatible with '
3943 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003944 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003945 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003946 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003947
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003948 issue = None
3949 if options.issue:
3950 try:
3951 issue = int(options.issue)
3952 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003953 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003954
Edward Lemur934836a2019-09-09 20:16:54 +00003955 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003956
3957 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003958 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003959 return 0
3960
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003961 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3962 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003963 for comment in summary:
3964 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003965 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003966 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003967 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003968 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003969 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003970 elif comment.autogenerated:
3971 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003972 else:
3973 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003974 print('\n%s%s %s%s\n%s' % (
3975 color,
3976 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3977 comment.sender,
3978 Fore.RESET,
3979 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3980
smut@google.comc85ac942015-09-15 16:34:43 +00003981 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003982 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003983 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003984 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3985 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003986 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003987 return 0
3988
3989
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003990@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003991@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003992def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003993 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003994 parser.add_option('-d', '--display', action='store_true',
3995 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003996 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003997 help='New description to set for this issue (- for stdin, '
3998 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003999 parser.add_option('-f', '--force', action='store_true',
4000 help='Delete any unpublished Gerrit edits for this issue '
4001 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004002
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004003 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004004
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004005 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004006 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004007 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004008 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004009 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004010
Edward Lemur934836a2019-09-09 20:16:54 +00004011 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004012 if target_issue_arg:
4013 kwargs['issue'] = target_issue_arg.issue
4014 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004015
4016 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004017 if not cl.GetIssue():
4018 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004019
Edward Lemur678a6842019-10-03 22:25:05 +00004020 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004021 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004022
Edward Lemur6c6827c2020-02-06 21:15:18 +00004023 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004024
smut@google.com34fb6b12015-07-13 20:03:26 +00004025 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004026 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004027 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004028
4029 if options.new_description:
4030 text = options.new_description
4031 if text == '-':
4032 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004033 elif text == '+':
4034 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004035 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004036
4037 description.set_description(text)
4038 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004039 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004040 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004041 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004042 return 0
4043
4044
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004045@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004046def CMDlint(parser, args):
4047 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004048 parser.add_option('--filter', action='append', metavar='-x,+y',
4049 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004050 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004051
4052 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004053 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004054 try:
4055 import cpplint
4056 import cpplint_chromium
4057 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004058 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004059 return 1
4060
4061 # Change the current working directory before calling lint so that it
4062 # shows the correct base.
4063 previous_cwd = os.getcwd()
4064 os.chdir(settings.GetRoot())
4065 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004066 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004067 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004068 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004070 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004071
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004072 # Process cpplint arguments, if any.
4073 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4074 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004075 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004076
Lei Zhang379d1ad2020-07-15 19:40:06 +00004077 include_regex = re.compile(settings.GetLintRegex())
4078 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004079 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4080 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004081 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004083 continue
4084
4085 if ignore_regex.match(filename):
4086 print('Ignoring file %s' % filename)
4087 continue
4088
4089 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4090 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004091 finally:
4092 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004094 if cpplint._cpplint_state.error_count != 0:
4095 return 1
4096 return 0
4097
4098
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004099@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004100def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004101 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004102 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004103 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004104 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004105 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004106 parser.add_option('--all', action='store_true',
4107 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004108 parser.add_option('--files',
4109 nargs=1,
4110 help='Semicolon-separated list of files to be marked as '
4111 'modified when executing presubmit or post-upload hooks. '
4112 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004113 parser.add_option('--parallel', action='store_true',
4114 help='Run all tests specified by input_api.RunTests in all '
4115 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004116 parser.add_option('--resultdb', action='store_true',
4117 help='Run presubmit checks in the ResultSink environment '
4118 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004119 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004120 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004121
sbc@chromium.org71437c02015-04-09 19:29:40 +00004122 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004124 return 1
4125
Edward Lemur934836a2019-09-09 20:16:54 +00004126 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004127 if args:
4128 base_branch = args[0]
4129 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004130 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004131 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004132
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004133 start = time.time()
4134 try:
4135 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4136 description = cl.FetchDescription()
4137 else:
4138 description = _create_description_from_log([base_branch])
4139 except Exception as e:
4140 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004141 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004142 elapsed = time.time() - start
4143 if elapsed > 5:
4144 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004145
Bruce Dawson13acea32022-05-03 22:13:08 +00004146 if not base_branch:
4147 if not options.force:
4148 print('use --force to check even when not on a branch.')
4149 return 1
4150 base_branch = 'HEAD'
4151
Josip Sokcevic017544d2022-03-31 23:47:53 +00004152 cl.RunHook(committing=not options.upload,
4153 may_prompt=False,
4154 verbose=options.verbose,
4155 parallel=options.parallel,
4156 upstream=base_branch,
4157 description=description,
4158 all_files=options.all,
4159 files=options.files,
4160 resultdb=options.resultdb,
4161 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004162 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004163
4164
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004165def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004166 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004167
4168 Works the same way as
4169 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4170 but can be called on demand on all platforms.
4171
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004172 The basic idea is to generate git hash of a state of the tree, original
4173 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004174 """
4175 lines = []
4176 tree_hash = RunGitSilent(['write-tree'])
4177 lines.append('tree %s' % tree_hash.strip())
4178 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4179 if code == 0:
4180 lines.append('parent %s' % parent.strip())
4181 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4182 lines.append('author %s' % author.strip())
4183 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4184 lines.append('committer %s' % committer.strip())
4185 lines.append('')
4186 # Note: Gerrit's commit-hook actually cleans message of some lines and
4187 # whitespace. This code is not doing this, but it clearly won't decrease
4188 # entropy.
4189 lines.append(message)
4190 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004191 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004192 return 'I%s' % change_hash.strip()
4193
4194
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004195def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004196 """Computes the remote branch ref to use for the CL.
4197
4198 Args:
4199 remote (str): The git remote for the CL.
4200 remote_branch (str): The git remote branch for the CL.
4201 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004202 """
4203 if not (remote and remote_branch):
4204 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004205
wittman@chromium.org455dc922015-01-26 20:15:50 +00004206 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004207 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004208 # refs, which are then translated into the remote full symbolic refs
4209 # below.
4210 if '/' not in target_branch:
4211 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4212 else:
4213 prefix_replacements = (
4214 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4215 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4216 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4217 )
4218 match = None
4219 for regex, replacement in prefix_replacements:
4220 match = re.search(regex, target_branch)
4221 if match:
4222 remote_branch = target_branch.replace(match.group(0), replacement)
4223 break
4224 if not match:
4225 # This is a branch path but not one we recognize; use as-is.
4226 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004227 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004228 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004229 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004230 # Handle the refs that need to land in different refs.
4231 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004232
wittman@chromium.org455dc922015-01-26 20:15:50 +00004233 # Create the true path to the remote branch.
4234 # Does the following translation:
4235 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004236 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004237 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4238 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4239 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4240 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4241 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4242 'refs/heads/')
4243 elif remote_branch.startswith('refs/remotes/branch-heads'):
4244 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004245
wittman@chromium.org455dc922015-01-26 20:15:50 +00004246 return remote_branch
4247
4248
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004249def cleanup_list(l):
4250 """Fixes a list so that comma separated items are put as individual items.
4251
4252 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4253 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4254 """
4255 items = sum((i.split(',') for i in l), [])
4256 stripped_items = (i.strip() for i in items)
4257 return sorted(filter(None, stripped_items))
4258
4259
Aaron Gable4db38df2017-11-03 14:59:07 -07004260@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004261@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004262def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004263 """Uploads the current changelist to codereview.
4264
4265 Can skip dependency patchset uploads for a branch by running:
4266 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004267 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004268 git config --unset branch.branch_name.skip-deps-uploads
4269 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004270
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004271 If the name of the checked out branch starts with "bug-" or "fix-" followed
4272 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004273 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004274
4275 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004276 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004277 [git-cl] add support for hashtags
4278 Foo bar: implement foo
4279 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004280 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004281 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4282 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004283 parser.add_option('--bypass-watchlists', action='store_true',
4284 dest='bypass_watchlists',
4285 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004286 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004287 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004288 parser.add_option('--message', '-m', dest='message',
4289 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004290 parser.add_option('-b', '--bug',
4291 help='pre-populate the bug number(s) for this issue. '
4292 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004293 parser.add_option('--message-file', dest='message_file',
4294 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004295 parser.add_option('--title', '-t', dest='title',
4296 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004297 parser.add_option('-T', '--skip-title', action='store_true',
4298 dest='skip_title',
4299 help='Use the most recent commit message as the title of '
4300 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004301 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004302 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004303 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004304 parser.add_option('--tbrs',
4305 action='append', default=[],
4306 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004307 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004308 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004309 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004310 parser.add_option('--hashtag', dest='hashtags',
4311 action='append', default=[],
4312 help=('Gerrit hashtag for new CL; '
4313 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004314 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004315 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004316 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004317 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004318 metavar='TARGET',
4319 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004320 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004321 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004322 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004323 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004324 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004325 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004326 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004327 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4328 const='TBR', help='add a set of OWNERS to TBR')
4329 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4330 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004331 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004332 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004333 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004334 'implies --send-mail')
4335 parser.add_option('-d', '--cq-dry-run',
4336 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004337 help='Send the patchset to do a CQ dry run right after '
4338 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004339 parser.add_option(
4340 '-q',
4341 '--cq-quick-run',
4342 action='store_true',
4343 default=False,
4344 help='Send the patchset to do a CQ quick run right after '
4345 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4346 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004347 parser.add_option('--set-bot-commit', action='store_true',
4348 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004349 parser.add_option('--preserve-tryjobs', action='store_true',
4350 help='instruct the CQ to let tryjobs running even after '
4351 'new patchsets are uploaded instead of canceling '
4352 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004353 parser.add_option('--dependencies', action='store_true',
4354 help='Uploads CLs of all the local branches that depend on '
4355 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004356 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4357 help='Sends your change to the CQ after an approval. Only '
4358 'works on repos that have the Auto-Submit label '
4359 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004360 parser.add_option('--parallel', action='store_true',
4361 help='Run all tests specified by input_api.RunTests in all '
4362 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004363 parser.add_option('--no-autocc', action='store_true',
4364 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004365 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004366 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004367 parser.add_option('-R', '--retry-failed', action='store_true',
4368 help='Retry failed tryjobs from old patchset immediately '
4369 'after uploading new patchset. Cannot be used with '
4370 '--use-commit-queue or --cq-dry-run.')
4371 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4372 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004373 parser.add_option('--fixed', '-x',
4374 help='List of bugs that will be commented on and marked '
4375 'fixed (pre-populates "Fixed:" tag). Same format as '
4376 '-b option / "Bug:" tag. If fixing several issues, '
4377 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004378 parser.add_option('--edit-description', action='store_true', default=False,
4379 help='Modify description before upload. Cannot be used '
4380 'with --force. It is a noop when --no-squash is set '
4381 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004382 parser.add_option('--git-completion-helper', action="store_true",
4383 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004384 parser.add_option('--resultdb', action='store_true',
4385 help='Run presubmit checks in the ResultSink environment '
4386 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004387 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004388 parser.add_option('-o',
4389 '--push-options',
4390 action='append',
4391 default=[],
4392 help='Transmit the given string to the server when '
4393 'performing git push (pass-through). See git-push '
4394 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004395 parser.add_option('--no-add-changeid',
4396 action='store_true',
4397 dest='no_add_changeid',
4398 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004399
rmistry@google.com2dd99862015-06-22 12:22:18 +00004400 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004401 (options, args) = parser.parse_args(args)
4402
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004403 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004404 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4405 if opt.help != optparse.SUPPRESS_HELP))
4406 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004407
sbc@chromium.org71437c02015-04-09 19:29:40 +00004408 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004409 return 1
4410
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004411 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004412 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004413 options.cc = cleanup_list(options.cc)
4414
Josipe827b0f2020-01-30 00:07:20 +00004415 if options.edit_description and options.force:
4416 parser.error('Only one of --force and --edit-description allowed')
4417
tandriib80458a2016-06-23 12:20:07 -07004418 if options.message_file:
4419 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004420 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004421 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004422
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004423 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004424 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004425 options.use_commit_queue,
4426 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004427 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4428 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004429
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004430 if options.skip_title and options.title:
4431 parser.error('Only one of --title and --skip-title allowed.')
4432
Aaron Gableedbc4132017-09-11 13:22:28 -07004433 if options.use_commit_queue:
4434 options.send_mail = True
4435
Edward Lesmes0dd54822020-03-26 18:24:25 +00004436 if options.squash is None:
4437 # Load default for user, repo, squash=true, in this order.
4438 options.squash = settings.GetSquashGerritUploads()
4439
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004440 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004441 # Warm change details cache now to avoid RPCs later, reducing latency for
4442 # developers.
4443 if cl.GetIssue():
4444 cl._GetChangeDetail(
4445 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4446
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004447 if options.retry_failed and not cl.GetIssue():
4448 print('No previous patchsets, so --retry-failed has no effect.')
4449 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004450
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004451 # cl.GetMostRecentPatchset uses cached information, and can return the last
4452 # patchset before upload. Calling it here makes it clear that it's the
4453 # last patchset before upload. Note that GetMostRecentPatchset will fail
4454 # if no CL has been uploaded yet.
4455 if options.retry_failed:
4456 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004457
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004458 ret = cl.CMDUpload(options, args, orig_args)
4459
4460 if options.retry_failed:
4461 if ret != 0:
4462 print('Upload failed, so --retry-failed has no effect.')
4463 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004464 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004465 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004466 jobs = _filter_failed_for_retry(builds)
4467 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004468 print('No failed tryjobs, so --retry-failed has no effect.')
4469 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004470 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004471
4472 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004473
4474
Francois Dorayd42c6812017-05-30 15:10:20 -04004475@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004476@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004477def CMDsplit(parser, args):
4478 """Splits a branch into smaller branches and uploads CLs.
4479
4480 Creates a branch and uploads a CL for each group of files modified in the
4481 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004482 comment, the string '$directory', is replaced with the directory containing
4483 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004484 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004485 parser.add_option('-d', '--description', dest='description_file',
4486 help='A text file containing a CL description in which '
4487 '$directory will be replaced by each CL\'s directory.')
4488 parser.add_option('-c', '--comment', dest='comment_file',
4489 help='A text file containing a CL comment.')
4490 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004491 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004492 help='List the files and reviewers for each CL that would '
4493 'be created, but don\'t create branches or CLs.')
4494 parser.add_option('--cq-dry-run', action='store_true',
4495 help='If set, will do a cq dry run for each uploaded CL. '
4496 'Please be careful when doing this; more than ~10 CLs '
4497 'has the potential to overload our build '
4498 'infrastructure. Try to upload these not during high '
4499 'load times (usually 11-3 Mountain View time). Email '
4500 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004501 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4502 default=True,
4503 help='Sends your change to the CQ after an approval. Only '
4504 'works on repos that have the Auto-Submit label '
4505 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004506 options, _ = parser.parse_args(args)
4507
4508 if not options.description_file:
4509 parser.error('No --description flag specified.')
4510
4511 def WrappedCMDupload(args):
4512 return CMDupload(OptionParser(), args)
4513
Edward Lemur2c62b332020-03-12 22:12:33 +00004514 return split_cl.SplitCl(
4515 options.description_file, options.comment_file, Changelist,
4516 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4517 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004518
4519
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004520@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004521@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004523 """DEPRECATED: Used to commit the current changelist via git-svn."""
4524 message = ('git-cl no longer supports committing to SVN repositories via '
4525 'git-svn. You probably want to use `git cl land` instead.')
4526 print(message)
4527 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004528
4529
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004530@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004531@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004532def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004533 """Commits the current changelist via git.
4534
4535 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4536 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004537 """
4538 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4539 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004540 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004541 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004542 parser.add_option('--parallel', action='store_true',
4543 help='Run all tests specified by input_api.RunTests in all '
4544 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004545 parser.add_option('--resultdb', action='store_true',
4546 help='Run presubmit checks in the ResultSink environment '
4547 'and send results to the ResultDB database.')
4548 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004549 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004550
Edward Lemur934836a2019-09-09 20:16:54 +00004551 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004552
Robert Iannucci2e73d432018-03-14 01:10:47 -07004553 if not cl.GetIssue():
4554 DieWithError('You must upload the change first to Gerrit.\n'
4555 ' If you would rather have `git cl land` upload '
4556 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004557 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4558 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004559
4560
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004561@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004562@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004563def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004564 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565 parser.add_option('-b', dest='newbranch',
4566 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004567 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004568 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004569 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004570 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004571
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004572 group = optparse.OptionGroup(
4573 parser,
4574 'Options for continuing work on the current issue uploaded from a '
4575 'different clone (e.g. different machine). Must be used independently '
4576 'from the other options. No issue number should be specified, and the '
4577 'branch must have an issue number associated with it')
4578 group.add_option('--reapply', action='store_true', dest='reapply',
4579 help='Reset the branch and reapply the issue.\n'
4580 'CAUTION: This will undo any local changes in this '
4581 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004582
4583 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004584 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004585 parser.add_option_group(group)
4586
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004587 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004588
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004589 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004590 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004591 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004592 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004593 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004594
Edward Lemur934836a2019-09-09 20:16:54 +00004595 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004596 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004597 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004598
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004599 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004600 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004601 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004602
4603 RunGit(['reset', '--hard', upstream])
4604 if options.pull:
4605 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004606
Edward Lemur678a6842019-10-03 22:25:05 +00004607 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004608 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4609 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004610
4611 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004612 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613
Edward Lemurf38bc172019-09-03 21:02:13 +00004614 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004615 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004616 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004617
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004618 # We don't want uncommitted changes mixed up with the patch.
4619 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004620 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004621
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004622 if options.newbranch:
4623 if options.force:
4624 RunGit(['branch', '-D', options.newbranch],
4625 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004626 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004627
Edward Lemur678a6842019-10-03 22:25:05 +00004628 cl = Changelist(
4629 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004630
Edward Lemur678a6842019-10-03 22:25:05 +00004631 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004632 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004633
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004634 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4635 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004636
4637
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004638def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 """Fetches the tree status and returns either 'open', 'closed',
4640 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004641 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004642 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004643 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644 if status.find('closed') != -1 or status == '0':
4645 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004646
4647 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004648 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004649
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004651 return 'unset'
4652
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004653
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004654def GetTreeStatusReason():
4655 """Fetches the tree status from a json url and returns the message
4656 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004657 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004658 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004659 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004660 status = json.loads(connection.read())
4661 connection.close()
4662 return status['message']
4663
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004664
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004665@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004666def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004667 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004668 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004669 status = GetTreeStatus()
4670 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004671 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004672 return 2
4673
vapiera7fbd5a2016-06-16 09:17:49 -07004674 print('The tree is %s' % status)
4675 print()
4676 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004677 if status != 'open':
4678 return 1
4679 return 0
4680
4681
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004682@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004683def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004684 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4685 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004686 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004687 '-b', '--bot', action='append',
4688 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4689 'times to specify multiple builders. ex: '
4690 '"-b win_rel -b win_layout". See '
4691 'the try server waterfall for the builders name and the tests '
4692 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004693 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004694 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004695 help=('Buildbucket bucket to send the try requests. Format: '
4696 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004697 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004698 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004699 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004700 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004701 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004702 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004703 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004704 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004705 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004706 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004707 '-q',
4708 '--quick-run',
4709 action='store_true',
4710 default=False,
4711 help='trigger in quick run mode '
4712 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4713 'uick_run.md) (chromium only).')
4714 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004715 '--category', default='git_cl_try', help='Specify custom build category.')
4716 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004717 '--project',
4718 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004719 'in recipe to determine to which repository or directory to '
4720 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '-p', '--property', dest='properties', action='append', default=[],
4723 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004724 'key2=value2 etc. The value will be treated as '
4725 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004726 'NOTE: using this may make your tryjob not usable for CQ, '
4727 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004728 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004729 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4730 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004731 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004732 parser.add_option(
4733 '-R', '--retry-failed', action='store_true', default=False,
4734 help='Retry failed jobs from the latest set of tryjobs. '
4735 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004736 parser.add_option(
4737 '-i', '--issue', type=int,
4738 help='Operate on this issue instead of the current branch\'s implicit '
4739 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004740 options, args = parser.parse_args(args)
4741
machenbach@chromium.org45453142015-09-15 08:45:22 +00004742 # Make sure that all properties are prop=value pairs.
4743 bad_params = [x for x in options.properties if '=' not in x]
4744 if bad_params:
4745 parser.error('Got properties with missing "=": %s' % bad_params)
4746
maruel@chromium.org15192402012-09-06 12:38:29 +00004747 if args:
4748 parser.error('Unknown arguments: %s' % args)
4749
Edward Lemur934836a2019-09-09 20:16:54 +00004750 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004751 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004752 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004753
Edward Lemurf38bc172019-09-03 21:02:13 +00004754 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004755 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004756
tandriie113dfd2016-10-11 10:20:12 -07004757 error_message = cl.CannotTriggerTryJobReason()
4758 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004759 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004760
Edward Lemur45768512020-03-02 19:03:14 +00004761 if options.bot:
4762 if options.retry_failed:
4763 parser.error('--bot is not compatible with --retry-failed.')
4764 if not options.bucket:
4765 parser.error('A bucket (e.g. "chromium/try") is required.')
4766
4767 triggered = [b for b in options.bot if 'triggered' in b]
4768 if triggered:
4769 parser.error(
4770 'Cannot schedule builds on triggered bots: %s.\n'
4771 'This type of bot requires an initial job from a parent (usually a '
4772 'builder). Schedule a job on the parent instead.\n' % triggered)
4773
4774 if options.bucket.startswith('.master'):
4775 parser.error('Buildbot masters are not supported.')
4776
4777 project, bucket = _parse_bucket(options.bucket)
4778 if project is None or bucket is None:
4779 parser.error('Invalid bucket: %s.' % options.bucket)
4780 jobs = sorted((project, bucket, bot) for bot in options.bot)
4781 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004782 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004783 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004784 if options.verbose:
4785 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004786 jobs = _filter_failed_for_retry(builds)
4787 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004788 print('There are no failed jobs in the latest set of jobs '
4789 '(patchset #%d), doing nothing.' % patchset)
4790 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004791 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004792 if num_builders > 10:
4793 confirm_or_exit('There are %d builders with failed builds.'
4794 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004795 elif options.quick_run:
4796 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4797 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004798 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004799 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004800 print('git cl try with no bots now defaults to CQ dry run.')
4801 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4802 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004803
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004804 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004805 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004806 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004807 except BuildbucketResponseException as ex:
4808 print('ERROR: %s' % ex)
4809 return 1
4810 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004811
4812
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004813@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004814def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004815 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004816 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004817 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004818 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004820 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004821 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004822 '--color', action='store_true', default=setup_color.IS_TTY,
4823 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004824 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004825 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4826 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004827 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004828 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004829 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004830 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004831 parser.add_option(
4832 '-i', '--issue', type=int,
4833 help='Operate on this issue instead of the current branch\'s implicit '
4834 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 options, args = parser.parse_args(args)
4836 if args:
4837 parser.error('Unrecognized args: %s' % ' '.join(args))
4838
Edward Lemur934836a2019-09-09 20:16:54 +00004839 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004840 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004841 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004842
tandrii221ab252016-10-06 08:12:04 -07004843 patchset = options.patchset
4844 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004845 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004846 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004847 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004848 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004849 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004850 cl.GetIssue())
4851
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004852 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004853 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004854 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004855 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004856 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004857 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004858 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004859 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004860 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004861 return 0
4862
4863
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004864@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004865@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004866def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004867 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004868 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004869 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004870 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004871
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004872 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004873 if args:
4874 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004875 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004876 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004877 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004878 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004879
4880 # Clear configured merge-base, if there is one.
4881 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004882 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004883 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004884 return 0
4885
4886
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004887@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004888def CMDweb(parser, args):
4889 """Opens the current CL in the web browser."""
4890 _, args = parser.parse_args(args)
4891 if args:
4892 parser.error('Unrecognized args: %s' % ' '.join(args))
4893
4894 issue_url = Changelist().GetIssueURL()
4895 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004896 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004897 return 1
4898
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004899 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004900 # allows us to hide the "Created new window in existing browser session."
4901 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004902 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004903 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004904 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004905 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004906 os.open(os.devnull, os.O_RDWR)
4907 try:
4908 webbrowser.open(issue_url)
4909 finally:
4910 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004911 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004912 return 0
4913
4914
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004915@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004916def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004917 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004918 parser.add_option('-d', '--dry-run', action='store_true',
4919 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004920 parser.add_option(
4921 '-q',
4922 '--quick-run',
4923 action='store_true',
4924 help='trigger in quick run mode '
4925 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4926 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004927 parser.add_option('-c', '--clear', action='store_true',
4928 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004929 parser.add_option(
4930 '-i', '--issue', type=int,
4931 help='Operate on this issue instead of the current branch\'s implicit '
4932 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004933 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004934 if args:
4935 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004936 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4937 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004938
Edward Lemur934836a2019-09-09 20:16:54 +00004939 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004940 if not cl.GetIssue():
4941 parser.error('Must upload the issue first.')
4942
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004943 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004944 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004945 elif options.quick_run:
4946 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004947 elif options.dry_run:
4948 state = _CQState.DRY_RUN
4949 else:
4950 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004951 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004952 return 0
4953
4954
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004955@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004956def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004957 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004958 parser.add_option(
4959 '-i', '--issue', type=int,
4960 help='Operate on this issue instead of the current branch\'s implicit '
4961 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004962 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004963 if args:
4964 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004965 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004966 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004967 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004968 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004969 cl.CloseIssue()
4970 return 0
4971
4972
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004973@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004974def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004975 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004976 parser.add_option(
4977 '--stat',
4978 action='store_true',
4979 dest='stat',
4980 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004981 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004982 if args:
4983 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004984
Edward Lemur934836a2019-09-09 20:16:54 +00004985 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004986 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004987 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004988 if not issue:
4989 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004990
Aaron Gablea718c3e2017-08-28 17:47:28 -07004991 base = cl._GitGetBranchConfigValue('last-upload-hash')
4992 if not base:
4993 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4994 if not base:
4995 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4996 revision_info = detail['revisions'][detail['current_revision']]
4997 fetch_info = revision_info['fetch']['http']
4998 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4999 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005000
Aaron Gablea718c3e2017-08-28 17:47:28 -07005001 cmd = ['git', 'diff']
5002 if options.stat:
5003 cmd.append('--stat')
5004 cmd.append(base)
5005 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005006
5007 return 0
5008
5009
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005010@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005011def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005012 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005013 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005014 '--ignore-current',
5015 action='store_true',
5016 help='Ignore the CL\'s current reviewers and start from scratch.')
5017 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005018 '--ignore-self',
5019 action='store_true',
5020 help='Do not consider CL\'s author as an owners.')
5021 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005022 '--no-color',
5023 action='store_true',
5024 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005025 parser.add_option(
5026 '--batch',
5027 action='store_true',
5028 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005029 # TODO: Consider moving this to another command, since other
5030 # git-cl owners commands deal with owners for a given CL.
5031 parser.add_option(
5032 '--show-all',
5033 action='store_true',
5034 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005035 options, args = parser.parse_args(args)
5036
Edward Lemur934836a2019-09-09 20:16:54 +00005037 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005038 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005039
Yang Guo6e269a02019-06-26 11:17:02 +00005040 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005041 if len(args) == 0:
5042 print('No files specified for --show-all. Nothing to do.')
5043 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005044 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005045 for path in args:
5046 print('Owners for %s:' % path)
5047 print('\n'.join(
5048 ' - %s' % owner
5049 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005050 return 0
5051
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005052 if args:
5053 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005054 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005055 base_branch = args[0]
5056 else:
5057 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005058 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005059
Edward Lemur2c62b332020-03-12 22:12:33 +00005060 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005061
5062 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005063 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5064 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005065 return 0
5066
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005067 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005068 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005069 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005070 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005071 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005072 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005073 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005074
5075
Aiden Bennerc08566e2018-10-03 17:52:42 +00005076def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005077 """Generates a diff command."""
5078 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005079 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5080
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005081 if allow_prefix:
5082 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5083 # case that diff.noprefix is set in the user's git config.
5084 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5085 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005086 diff_cmd += ['--no-prefix']
5087
5088 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005089
5090 if args:
5091 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005092 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005093 diff_cmd.append(arg)
5094 else:
5095 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005096
5097 return diff_cmd
5098
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005099
Jamie Madill5e96ad12020-01-13 16:08:35 +00005100def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5101 """Runs clang-format-diff and sets a return value if necessary."""
5102
5103 if not clang_diff_files:
5104 return 0
5105
5106 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5107 # formatted. This is used to block during the presubmit.
5108 return_value = 0
5109
5110 # Locate the clang-format binary in the checkout
5111 try:
5112 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5113 except clang_format.NotFoundError as e:
5114 DieWithError(e)
5115
5116 if opts.full or settings.GetFormatFullByDefault():
5117 cmd = [clang_format_tool]
5118 if not opts.dry_run and not opts.diff:
5119 cmd.append('-i')
5120 if opts.dry_run:
5121 for diff_file in clang_diff_files:
5122 with open(diff_file, 'r') as myfile:
5123 code = myfile.read().replace('\r\n', '\n')
5124 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5125 stdout = stdout.replace('\r\n', '\n')
5126 if opts.diff:
5127 sys.stdout.write(stdout)
5128 if code != stdout:
5129 return_value = 2
5130 else:
5131 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5132 if opts.diff:
5133 sys.stdout.write(stdout)
5134 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005135 try:
5136 script = clang_format.FindClangFormatScriptInChromiumTree(
5137 'clang-format-diff.py')
5138 except clang_format.NotFoundError as e:
5139 DieWithError(e)
5140
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005141 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005142 if not opts.dry_run and not opts.diff:
5143 cmd.append('-i')
5144
5145 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005146 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005147
Edward Lesmes89624cd2020-04-06 17:51:56 +00005148 env = os.environ.copy()
5149 env['PATH'] = (
5150 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5151 stdout = RunCommand(
5152 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005153 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005154 if opts.diff:
5155 sys.stdout.write(stdout)
5156 if opts.dry_run and len(stdout) > 0:
5157 return_value = 2
5158
5159 return return_value
5160
5161
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005162def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5163 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5164 presubmit checks have failed (and returns 0 otherwise)."""
5165
5166 if not rust_diff_files:
5167 return 0
5168
5169 # Locate the rustfmt binary.
5170 try:
5171 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5172 except rustfmt.NotFoundError as e:
5173 DieWithError(e)
5174
5175 # TODO(crbug.com/1231317): Support formatting only the changed lines
5176 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5177 # https://github.com/emilio/rustfmt-format-diff
5178 cmd = [rustfmt_tool]
5179 if opts.dry_run:
5180 cmd.append('--check')
5181 cmd += rust_diff_files
5182 rustfmt_exitcode = subprocess2.call(cmd)
5183
5184 if opts.presubmit and rustfmt_exitcode != 0:
5185 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005186
5187 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005188
5189
Olivier Robin0a6b5442022-04-07 07:25:04 +00005190def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5191 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5192 that presubmit checks have failed (and returns 0 otherwise)."""
5193
5194 if not swift_diff_files:
5195 return 0
5196
5197 # Locate the swift-format binary.
5198 try:
5199 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5200 except swift_format.NotFoundError as e:
5201 DieWithError(e)
5202
5203 cmd = [swift_format_tool]
5204 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005205 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005206 else:
5207 cmd += ['format', '-i']
5208 cmd += swift_diff_files
5209 swift_format_exitcode = subprocess2.call(cmd)
5210
5211 if opts.presubmit and swift_format_exitcode != 0:
5212 return 2
5213
5214 return 0
5215
5216
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005217def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005218 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005219 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005220
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005221
enne@chromium.org555cfe42014-01-29 18:21:39 +00005222@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005223@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005224def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005225 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005226 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005227 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005228 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005229 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005230 parser.add_option('--full', action='store_true',
5231 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005232 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005233 parser.add_option('--dry-run', action='store_true',
5234 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005235 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005236 '--no-clang-format',
5237 dest='clang_format',
5238 action='store_false',
5239 default=True,
5240 help='Disables formatting of various file types using clang-format.')
5241 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005242 '--python',
5243 action='store_true',
5244 default=None,
5245 help='Enables python formatting on all python files.')
5246 parser.add_option(
5247 '--no-python',
5248 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005249 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005250 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005251 'If neither --python or --no-python are set, python files that have a '
5252 '.style.yapf file in an ancestor directory will be formatted. '
5253 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005254 parser.add_option(
5255 '--js',
5256 action='store_true',
5257 help='Format javascript code with clang-format. '
5258 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005259 parser.add_option('--diff', action='store_true',
5260 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005261 parser.add_option('--presubmit', action='store_true',
5262 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005263
5264 parser.add_option('--rust-fmt',
5265 dest='use_rust_fmt',
5266 action='store_true',
5267 default=rustfmt.IsRustfmtSupported(),
5268 help='Enables formatting of Rust file types using rustfmt.')
5269 parser.add_option(
5270 '--no-rust-fmt',
5271 dest='use_rust_fmt',
5272 action='store_false',
5273 help='Disables formatting of Rust file types using rustfmt.')
5274
Olivier Robin0a6b5442022-04-07 07:25:04 +00005275 parser.add_option(
5276 '--swift-format',
5277 dest='use_swift_format',
5278 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005279 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005280 help='Enables formatting of Swift file types using swift-format '
5281 '(macOS host only).')
5282 parser.add_option(
5283 '--no-swift-format',
5284 dest='use_swift_format',
5285 action='store_false',
5286 help='Disables formatting of Swift file types using swift-format.')
5287
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005288 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005289
Garrett Beaty91a6f332020-01-06 16:57:24 +00005290 if opts.python is not None and opts.no_python:
5291 raise parser.error('Cannot set both --python and --no-python')
5292 if opts.no_python:
5293 opts.python = False
5294
Daniel Chengc55eecf2016-12-30 03:11:02 -08005295 # Normalize any remaining args against the current path, so paths relative to
5296 # the current directory are still resolved as expected.
5297 args = [os.path.join(os.getcwd(), arg) for arg in args]
5298
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005299 # git diff generates paths against the root of the repository. Change
5300 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005301 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005302 if rel_base_path:
5303 os.chdir(rel_base_path)
5304
digit@chromium.org29e47272013-05-17 17:01:46 +00005305 # Grab the merge-base commit, i.e. the upstream commit of the current
5306 # branch when it was created or the last time it was rebased. This is
5307 # to cover the case where the user may have called "git fetch origin",
5308 # moving the origin branch to a newer commit, but hasn't rebased yet.
5309 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005310 upstream_branch = opts.upstream
5311 if not upstream_branch:
5312 cl = Changelist()
5313 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005314 if upstream_branch:
5315 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5316 upstream_commit = upstream_commit.strip()
5317
5318 if not upstream_commit:
5319 DieWithError('Could not find base commit for this branch. '
5320 'Are you in detached state?')
5321
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005322 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5323 diff_output = RunGit(changed_files_cmd)
5324 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005325 # Filter out files deleted by this CL
5326 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005327
Andreas Haas417d89c2020-02-06 10:24:27 +00005328 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005329 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005330
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005331 clang_diff_files = []
5332 if opts.clang_format:
5333 clang_diff_files = [
5334 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5335 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005336 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005337 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005338 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005339 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005340
Edward Lesmes50da7702020-03-30 19:23:43 +00005341 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005342
Jamie Madill5e96ad12020-01-13 16:08:35 +00005343 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5344 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005345
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005346 if opts.use_rust_fmt:
5347 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5348 upstream_commit)
5349 if rust_fmt_return_value == 2:
5350 return_value = 2
5351
Olivier Robin0a6b5442022-04-07 07:25:04 +00005352 if opts.use_swift_format:
5353 if sys.platform != 'darwin':
5354 DieWithError('swift-format is only supported on macOS.')
5355 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5356 upstream_commit)
5357 if swift_format_return_value == 2:
5358 return_value = 2
5359
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005360 # Similar code to above, but using yapf on .py files rather than clang-format
5361 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005362 py_explicitly_disabled = opts.python is not None and not opts.python
5363 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005364 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5365 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005366
Aiden Bennerc08566e2018-10-03 17:52:42 +00005367 # Used for caching.
5368 yapf_configs = {}
5369 for f in python_diff_files:
5370 # Find the yapf style config for the current file, defaults to depot
5371 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005372 _FindYapfConfigFile(f, yapf_configs, top_dir)
5373
5374 # Turn on python formatting by default if a yapf config is specified.
5375 # This breaks in the case of this repo though since the specified
5376 # style file is also the global default.
5377 if opts.python is None:
5378 filtered_py_files = []
5379 for f in python_diff_files:
5380 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5381 filtered_py_files.append(f)
5382 else:
5383 filtered_py_files = python_diff_files
5384
5385 # Note: yapf still seems to fix indentation of the entire file
5386 # even if line ranges are specified.
5387 # See https://github.com/google/yapf/issues/499
5388 if not opts.full and filtered_py_files:
5389 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5390
Brian Sheedyb4307d52019-12-02 19:18:17 +00005391 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5392 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5393 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005394
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005395 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005396 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5397 # Default to pep8 if not .style.yapf is found.
5398 if not yapf_style:
5399 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005400
Peter Wend9399922020-06-17 17:33:49 +00005401 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005402 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005403 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005404 else:
5405 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005406
5407 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005408
5409 has_formattable_lines = False
5410 if not opts.full:
5411 # Only run yapf over changed line ranges.
5412 for diff_start, diff_len in py_line_diffs[f]:
5413 diff_end = diff_start + diff_len - 1
5414 # Yapf errors out if diff_end < diff_start but this
5415 # is a valid line range diff for a removal.
5416 if diff_end >= diff_start:
5417 has_formattable_lines = True
5418 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5419 # If all line diffs were removals we have nothing to format.
5420 if not has_formattable_lines:
5421 continue
5422
5423 if opts.diff or opts.dry_run:
5424 cmd += ['--diff']
5425 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005426 stdout = RunCommand(cmd,
5427 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005428 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005429 cwd=top_dir,
5430 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005431 if opts.diff:
5432 sys.stdout.write(stdout)
5433 elif len(stdout) > 0:
5434 return_value = 2
5435 else:
5436 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005437 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005438
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005439 # Format GN build files. Always run on full build files for canonical form.
5440 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005441 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005442 if opts.dry_run or opts.diff:
5443 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005444 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005445 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005446 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005447 cwd=top_dir)
5448 if opts.dry_run and gn_ret == 2:
5449 return_value = 2 # Not formatted.
5450 elif opts.diff and gn_ret == 2:
5451 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005452 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005453 elif gn_ret != 0:
5454 # For non-dry run cases (and non-2 return values for dry-run), a
5455 # nonzero error code indicates a failure, probably because the file
5456 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005457 DieWithError('gn format failed on ' + gn_diff_file +
5458 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005459
Ilya Shermane081cbe2017-08-15 17:51:04 -07005460 # Skip the metrics formatting from the global presubmit hook. These files have
5461 # a separate presubmit hook that issues an error if the files need formatting,
5462 # whereas the top-level presubmit script merely issues a warning. Formatting
5463 # these files is somewhat slow, so it's important not to duplicate the work.
5464 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005465 for diff_xml in GetDiffXMLs(diff_files):
5466 xml_dir = GetMetricsDir(diff_xml)
5467 if not xml_dir:
5468 continue
5469
Ilya Shermane081cbe2017-08-15 17:51:04 -07005470 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005471 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5472 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005473
5474 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5475 # command as histograms/pretty_print.py now needs a relative path argument
5476 # after splitting the histograms into multiple directories.
5477 # For example, in tools/metrics/ukm, pretty-print could be run using:
5478 # $ python pretty_print.py
5479 # But in tools/metrics/histogrmas, pretty-print should be run with an
5480 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005481 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005482 # $ python pretty_print.py enums.xml
5483
5484 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5485 # version of histograms/pretty_print.py is released.
5486 filepath_required = os.path.exists(
5487 os.path.join(tool_dir, 'validate_prefix.py'))
5488
Weilun Shib92c4b72020-08-27 17:45:11 +00005489 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5490 or diff_xml.endswith('histogram_suffixes_list.xml')
5491 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005492 cmd.append(diff_xml)
5493
Ilya Shermane081cbe2017-08-15 17:51:04 -07005494 if opts.dry_run or opts.diff:
5495 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005496
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005497 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5498 # `shell` param and instead replace `'vpython'` with
5499 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005500 stdout = RunCommand(cmd,
5501 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005502 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005503 if opts.diff:
5504 sys.stdout.write(stdout)
5505 if opts.dry_run and stdout:
5506 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005507
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005508 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005509
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005510
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005511def GetDiffXMLs(diff_files):
5512 return [
5513 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5514 ]
5515
5516
5517def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005518 metrics_xml_dirs = [
5519 os.path.join('tools', 'metrics', 'actions'),
5520 os.path.join('tools', 'metrics', 'histograms'),
5521 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005522 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005523 os.path.join('tools', 'metrics', 'ukm'),
5524 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005525 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005526 if diff_xml.startswith(xml_dir):
5527 return xml_dir
5528 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005529
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005530
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005531@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005532@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005533def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005534 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005535 _, args = parser.parse_args(args)
5536
5537 if len(args) != 1:
5538 parser.print_help()
5539 return 1
5540
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005541 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005542 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005543 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005544
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005545 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005546
Edward Lemur52969c92020-02-06 18:15:28 +00005547 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005548 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005549 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005550
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005551 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005552 for key, issue in [x.split() for x in output.splitlines()]:
5553 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005554 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005555
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005556 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005557 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005558 return 1
5559 if len(branches) == 1:
5560 RunGit(['checkout', branches[0]])
5561 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005562 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005563 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005564 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005565 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005566 try:
5567 RunGit(['checkout', branches[int(which)]])
5568 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005569 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005570 return 1
5571
5572 return 0
5573
5574
maruel@chromium.org29404b52014-09-08 22:58:00 +00005575def CMDlol(parser, args):
5576 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005577 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005578 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5579 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5580 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005581 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005582 return 0
5583
5584
Josip Sokcevic0399e172022-03-21 23:11:51 +00005585def CMDversion(parser, args):
5586 import utils
5587 print(utils.depot_tools_version())
5588
5589
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005590class OptionParser(optparse.OptionParser):
5591 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005592
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005593 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005594 optparse.OptionParser.__init__(
5595 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005596 self.add_option(
5597 '-v', '--verbose', action='count', default=0,
5598 help='Use 2 times for more debugging info')
5599
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005600 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005601 try:
5602 return self._parse_args(args)
5603 finally:
5604 # Regardless of success or failure of args parsing, we want to report
5605 # metrics, but only after logging has been initialized (if parsing
5606 # succeeded).
5607 global settings
5608 settings = Settings()
5609
Edward Lesmes9c349062021-05-06 20:02:39 +00005610 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005611 # GetViewVCUrl ultimately calls logging method.
5612 project_url = settings.GetViewVCUrl().strip('/+')
5613 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5614 metrics.collector.add('project_urls', [project_url])
5615
5616 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005617 # Create an optparse.Values object that will store only the actual passed
5618 # options, without the defaults.
5619 actual_options = optparse.Values()
5620 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5621 # Create an optparse.Values object with the default options.
5622 options = optparse.Values(self.get_default_values().__dict__)
5623 # Update it with the options passed by the user.
5624 options._update_careful(actual_options.__dict__)
5625 # Store the options passed by the user in an _actual_options attribute.
5626 # We store only the keys, and not the values, since the values can contain
5627 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005628 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005629
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005630 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005631 logging.basicConfig(
5632 level=levels[min(options.verbose, len(levels) - 1)],
5633 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5634 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005635
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005636 return options, args
5637
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005638
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005639def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005640 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005641 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005642 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005643 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005644
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005645 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005646 dispatcher = subcommand.CommandDispatcher(__name__)
5647 try:
5648 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005649 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005650 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005651 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005652 if e.code != 500:
5653 raise
5654 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005655 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005656 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005657 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005658
5659
5660if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005661 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5662 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005663 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005664 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005665 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005666 sys.exit(main(sys.argv[1:]))