blob: 8ceea3a2a309c34517543040df6864f723932c7e [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
maruel@chromium.org2a74d372011-03-29 19:05:50 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
maruel@chromium.org2a74d372011-03-29 19:05:50 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
thestig@chromium.org44202a22014-03-11 19:22:18 +0000116# Valid extensions for files we want to lint.
117DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
118DEFAULT_LINT_IGNORE_REGEX = r"$^"
119
Aiden Bennerc08566e2018-10-03 17:52:42 +0000120# File name for yapf style config files.
121YAPF_CONFIG_FILENAME = '.style.yapf'
122
Edward Lesmes50da7702020-03-30 19:23:43 +0000123# The issue, patchset and codereview server are stored on git config for each
124# branch under branch.<branch-name>.<config-key>.
125ISSUE_CONFIG_KEY = 'gerritissue'
126PATCHSET_CONFIG_KEY = 'gerritpatchset'
127CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
128
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000129# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000130Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000131
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000132# Initialized in main()
133settings = None
134
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100135# Used by tests/git_cl_test.py to add extra logging.
136# Inside the weirdly failing test, add this:
137# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700138# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100139_IS_BEING_TESTED = False
140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000142_KNOWN_GERRIT_TO_SHORT_URLS = {
143 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
144 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
145}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000146assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
147 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000148
149
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000150class GitPushError(Exception):
151 pass
152
153
Christopher Lamf732cd52017-01-24 12:40:11 +1100154def DieWithError(message, change_desc=None):
155 if change_desc:
156 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000157 print('\n ** Content of CL description **\n' +
158 '='*72 + '\n' +
159 change_desc.description + '\n' +
160 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100161
vapiera7fbd5a2016-06-16 09:17:49 -0700162 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000163 sys.exit(1)
164
165
Christopher Lamf732cd52017-01-24 12:40:11 +1100166def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000167 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000168 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000169 with open(backup_path, 'wb') as backup_file:
170 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100171
172
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000173def GetNoGitPagerEnv():
174 env = os.environ.copy()
175 # 'cat' is a magical git string that disables pagers on all platforms.
176 env['GIT_PAGER'] = 'cat'
177 return env
178
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000179
bsep@chromium.org627d9002016-04-29 00:00:52 +0000180def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000181 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000182 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
183 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000184 except subprocess2.CalledProcessError as e:
185 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000186 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000187 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
188 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000189 out = e.stdout.decode('utf-8', 'replace')
190 if e.stderr:
191 out += e.stderr.decode('utf-8', 'replace')
192 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000193
194
195def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000196 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000197 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000198
199
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000200def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000201 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700202 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000203 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700204 else:
205 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000206 try:
tandrii5d48c322016-08-18 16:19:37 -0700207 (out, _), code = subprocess2.communicate(['git'] + args,
208 env=GetNoGitPagerEnv(),
209 stdout=subprocess2.PIPE,
210 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000211 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700212 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900213 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000214 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000215
216
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000217def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000218 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000219 return RunGitWithCode(args, suppress_stderr=True)[1]
220
221
tandrii2a16b952016-10-19 07:09:44 -0700222def time_sleep(seconds):
223 # Use this so that it can be mocked in tests without interfering with python
224 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700225 return time.sleep(seconds)
226
227
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000228def time_time():
229 # Use this so that it can be mocked in tests without interfering with python
230 # system machinery.
231 return time.time()
232
233
Edward Lemur1b52d872019-05-09 21:12:12 +0000234def datetime_now():
235 # Use this so that it can be mocked in tests without interfering with python
236 # system machinery.
237 return datetime.datetime.now()
238
239
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100240def confirm_or_exit(prefix='', action='confirm'):
241 """Asks user to press enter to continue or press Ctrl+C to abort."""
242 if not prefix or prefix.endswith('\n'):
243 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100244 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245 mid = ' Press'
246 elif prefix.endswith(' '):
247 mid = 'press'
248 else:
249 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000250 gclient_utils.AskForData(
251 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100252
253
254def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000255 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000256 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100257 while True:
258 if 'yes'.startswith(result):
259 return True
260 if 'no'.startswith(result):
261 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000262 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100263
264
machenbach@chromium.org45453142015-09-15 08:45:22 +0000265def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000266 prop_list = getattr(options, 'properties', [])
267 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000268 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000269 try:
270 properties[key] = json.loads(val)
271 except ValueError:
272 pass # If a value couldn't be evaluated, treat it as a string.
273 return properties
274
275
Edward Lemur4c707a22019-09-24 21:13:43 +0000276def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000277 """Calls a buildbucket v2 method and returns the parsed json response."""
278 headers = {
279 'Accept': 'application/json',
280 'Content-Type': 'application/json',
281 }
282 request = json.dumps(request)
283 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
284
285 logging.info('POST %s with %s' % (url, request))
286
287 attempts = 1
288 time_to_sleep = 1
289 while True:
290 response, content = http.request(url, 'POST', body=request, headers=headers)
291 if response.status == 200:
292 return json.loads(content[4:])
293 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
294 msg = '%s error when calling POST %s with %s: %s' % (
295 response.status, url, request, content)
296 raise BuildbucketResponseException(msg)
297 logging.debug(
298 '%s error when calling POST %s with %s. '
299 'Sleeping for %d seconds and retrying...' % (
300 response.status, url, request, time_to_sleep))
301 time.sleep(time_to_sleep)
302 time_to_sleep *= 2
303 attempts += 1
304
305 assert False, 'unreachable'
306
307
Edward Lemur6215c792019-10-03 21:59:05 +0000308def _parse_bucket(raw_bucket):
309 legacy = True
310 project = bucket = None
311 if '/' in raw_bucket:
312 legacy = False
313 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000314 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000315 elif raw_bucket.startswith('luci.'):
316 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000317 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000318 elif '.' in raw_bucket:
319 project = raw_bucket.split('.')[0]
320 bucket = raw_bucket
321 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000322 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000323 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
324 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325
326
Quinten Yearsley777660f2020-03-04 23:37:06 +0000327def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000328 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700329
330 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000331 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000332 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700333 options: Command-line options.
334 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000335 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000336 for project, bucket, builder in jobs:
337 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000338 print('To see results here, run: git cl try-results')
339 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700340
Quinten Yearsley777660f2020-03-04 23:37:06 +0000341 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000342 if not requests:
343 return
344
Edward Lemur5b929a42019-10-21 17:57:39 +0000345 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000346 http.force_exception_to_status_code = True
347
348 batch_request = {'requests': requests}
349 batch_response = _call_buildbucket(
350 http, options.buildbucket_host, 'Batch', batch_request)
351
352 errors = [
353 ' ' + response['error']['message']
354 for response in batch_response.get('responses', [])
355 if 'error' in response
356 ]
357 if errors:
358 raise BuildbucketResponseException(
359 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
360
361
Quinten Yearsley777660f2020-03-04 23:37:06 +0000362def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000363 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000364 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000365 shared_properties = {
366 'category': options.ensure_value('category', 'git_cl_try')
367 }
368 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000369 shared_properties['clobber'] = True
370 shared_properties.update(_get_properties_from_options(options) or {})
371
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000372 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000373 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000374 shared_tags.append({'key': 'retry_failed',
375 'value': '1'})
376
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000377 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000378 for (project, bucket, builder) in jobs:
379 properties = shared_properties.copy()
380 if 'presubmit' in builder.lower():
381 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000382
Edward Lemur45768512020-03-02 19:03:14 +0000383 requests.append({
384 'scheduleBuild': {
385 'requestId': str(uuid.uuid4()),
386 'builder': {
387 'project': getattr(options, 'project', None) or project,
388 'bucket': bucket,
389 'builder': builder,
390 },
391 'gerritChanges': gerrit_changes,
392 'properties': properties,
393 'tags': [
394 {'key': 'builder', 'value': builder},
395 ] + shared_tags,
396 }
397 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000398
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000399 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000400 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000401 requests[-1]['scheduleBuild']['gitilesCommit'] = {
402 'host': gerrit_changes[0]['host'],
403 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000404 'id': options.revision,
405 'ref': GetTargetRef(remote, remote_branch, None)
Edward Lemur45768512020-03-02 19:03:14 +0000406 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000407
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000408 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000409
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000410
Quinten Yearsley777660f2020-03-04 23:37:06 +0000411def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000412 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000413
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000414 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000415 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000416 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000417 request = {
418 'predicate': {
419 'gerritChanges': [changelist.GetGerritChange(patchset)],
420 },
421 'fields': ','.join('builds.*.' + field for field in fields),
422 }
tandrii221ab252016-10-06 08:12:04 -0700423
Edward Lemur5b929a42019-10-21 17:57:39 +0000424 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000425 if authenticator.has_cached_credentials():
426 http = authenticator.authorize(httplib2.Http())
427 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700428 print('Warning: Some results might be missing because %s' %
429 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000430 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000431 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000432 http.force_exception_to_status_code = True
433
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000434 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
435 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000436
Edward Lemur45768512020-03-02 19:03:14 +0000437
Edward Lemur5b929a42019-10-21 17:57:39 +0000438def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000439 """Fetches builds from the latest patchset that has builds (within
440 the last few patchsets).
441
442 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000443 changelist (Changelist): The CL to fetch builds for
444 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000445 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
446 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000447 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000448 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
449 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000450 """
451 assert buildbucket_host
452 assert changelist.GetIssue(), 'CL must be uploaded first'
453 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000454 if latest_patchset is None:
455 assert changelist.GetMostRecentPatchset()
456 ps = changelist.GetMostRecentPatchset()
457 else:
458 assert latest_patchset > 0, latest_patchset
459 ps = latest_patchset
460
Quinten Yearsley983111f2019-09-26 17:18:48 +0000461 min_ps = max(1, ps - 5)
462 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000463 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000464 if len(builds):
465 return builds, ps
466 ps -= 1
467 return [], 0
468
469
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000470def _filter_failed_for_retry(all_builds):
471 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000472
473 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000474 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000475 i.e. a list of buildbucket.v2.Builds which includes status and builder
476 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000477
478 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000479 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000480 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000481 """
Edward Lemur45768512020-03-02 19:03:14 +0000482 grouped = {}
483 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000484 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000485 key = (builder['project'], builder['bucket'], builder['builder'])
486 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000487
Edward Lemur45768512020-03-02 19:03:14 +0000488 jobs = []
489 for (project, bucket, builder), builds in grouped.items():
490 if 'triggered' in builder:
491 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
492 'from a parent. Please schedule a manual job for the parent '
493 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000494 continue
495 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
496 # Don't retry if any are running.
497 continue
Edward Lemur45768512020-03-02 19:03:14 +0000498 # If builder had several builds, retry only if the last one failed.
499 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
500 # build, but in case of retrying failed jobs retrying a flaky one makes
501 # sense.
502 builds = sorted(builds, key=lambda b: b['createTime'])
503 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
504 continue
505 # Don't retry experimental build previously triggered by CQ.
506 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
507 for t in builds[-1]['tags']):
508 continue
509 jobs.append((project, bucket, builder))
510
511 # Sort the jobs to make testing easier.
512 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000513
514
Quinten Yearsley777660f2020-03-04 23:37:06 +0000515def _print_tryjobs(options, builds):
516 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000517 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000518 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519 return
520
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000521 longest_builder = max(len(b['builder']['builder']) for b in builds)
522 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000523 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000524 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
525 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000527 builds_by_status = {}
528 for b in builds:
529 builds_by_status.setdefault(b['status'], []).append({
530 'id': b['id'],
531 'name': name_fmt.format(
532 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
533 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 sort_key = lambda b: (b['name'], b['id'])
536
537 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000538 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000539 if not builds:
540 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000542 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000543 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000544 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 else:
546 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
547
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 print(colorize(title))
549 for b in sorted(builds, key=sort_key):
550 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551
552 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000553 print_builds(
554 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
555 print_builds(
556 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
557 color=Fore.MAGENTA)
558 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
559 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
560 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000561 print_builds('Started:', builds_by_status.pop('STARTED', []),
562 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000563 print_builds(
564 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 print_builds(
567 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000568 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
570
Aiden Bennerc08566e2018-10-03 17:52:42 +0000571def _ComputeDiffLineRanges(files, upstream_commit):
572 """Gets the changed line ranges for each file since upstream_commit.
573
574 Parses a git diff on provided files and returns a dict that maps a file name
575 to an ordered list of range tuples in the form (start_line, count).
576 Ranges are in the same format as a git diff.
577 """
578 # If files is empty then diff_output will be a full diff.
579 if len(files) == 0:
580 return {}
581
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000582 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000583 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000584 diff_output = RunGit(diff_cmd)
585
586 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
587 # 2 capture groups
588 # 0 == fname of diff file
589 # 1 == 'diff_start,diff_count' or 'diff_start'
590 # will match each of
591 # diff --git a/foo.foo b/foo.py
592 # @@ -12,2 +14,3 @@
593 # @@ -12,2 +17 @@
594 # running re.findall on the above string with pattern will give
595 # [('foo.py', ''), ('', '14,3'), ('', '17')]
596
597 curr_file = None
598 line_diffs = {}
599 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
600 if match[0] != '':
601 # Will match the second filename in diff --git a/a.py b/b.py.
602 curr_file = match[0]
603 line_diffs[curr_file] = []
604 else:
605 # Matches +14,3
606 if ',' in match[1]:
607 diff_start, diff_count = match[1].split(',')
608 else:
609 # Single line changes are of the form +12 instead of +12,1.
610 diff_start = match[1]
611 diff_count = 1
612
613 diff_start = int(diff_start)
614 diff_count = int(diff_count)
615
616 # If diff_count == 0 this is a removal we can ignore.
617 line_diffs[curr_file].append((diff_start, diff_count))
618
619 return line_diffs
620
621
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000622def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000623 """Checks if a yapf file is in any parent directory of fpath until top_dir.
624
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000625 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000626 is found returns None. Uses yapf_config_cache as a cache for previously found
627 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000628 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000629 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000630 # Return result if we've already computed it.
631 if fpath in yapf_config_cache:
632 return yapf_config_cache[fpath]
633
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000634 parent_dir = os.path.dirname(fpath)
635 if os.path.isfile(fpath):
636 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000637 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000638 # Otherwise fpath is a directory
639 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
640 if os.path.isfile(yapf_file):
641 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000642 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000643 # If we're at the top level directory, or if we're at root
644 # there is no provided style.
645 ret = None
646 else:
647 # Otherwise recurse on the current directory.
648 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000649 yapf_config_cache[fpath] = ret
650 return ret
651
652
Brian Sheedyb4307d52019-12-02 19:18:17 +0000653def _GetYapfIgnorePatterns(top_dir):
654 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000655
656 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
657 but this functionality appears to break when explicitly passing files to
658 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000659 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000660 the .yapfignore file should be in the directory that yapf is invoked from,
661 which we assume to be the top level directory in this case.
662
663 Args:
664 top_dir: The top level directory for the repository being formatted.
665
666 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000667 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000668 """
669 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000670 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000671 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000672 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000673
Anthony Politoc64e3902021-04-30 21:55:25 +0000674 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
675 stripped_line = line.strip()
676 # Comments and blank lines should be ignored.
677 if stripped_line.startswith('#') or stripped_line == '':
678 continue
679 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000680 return ignore_patterns
681
682
683def _FilterYapfIgnoredFiles(filepaths, patterns):
684 """Filters out any filepaths that match any of the given patterns.
685
686 Args:
687 filepaths: An iterable of strings containing filepaths to filter.
688 patterns: An iterable of strings containing fnmatch patterns to filter on.
689
690 Returns:
691 A list of strings containing all the elements of |filepaths| that did not
692 match any of the patterns in |patterns|.
693 """
694 # Not inlined so that tests can use the same implementation.
695 return [f for f in filepaths
696 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000697
698
Aaron Gable13101a62018-02-09 13:20:41 -0800699def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000700 """Prints statistics about the change to the user."""
701 # --no-ext-diff is broken in some versions of Git, so try to work around
702 # this by overriding the environment (but there is still a problem if the
703 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000704 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000705 if 'GIT_EXTERNAL_DIFF' in env:
706 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000707
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000708 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800709 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000710 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000711
712
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000713class BuildbucketResponseException(Exception):
714 pass
715
716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000717class Settings(object):
718 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000719 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000720 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000721 self.tree_status_url = None
722 self.viewvc_url = None
723 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000724 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000725 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000726 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000727 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000728 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000729 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000730
Edward Lemur26964072020-02-19 19:18:51 +0000731 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000732 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000733 if self.updated:
734 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000735
Edward Lemur26964072020-02-19 19:18:51 +0000736 # The only value that actually changes the behavior is
737 # autoupdate = "false". Everything else means "true".
738 autoupdate = (
739 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
740
741 cr_settings_file = FindCodereviewSettingsFile()
742 if autoupdate != 'false' and cr_settings_file:
743 LoadCodereviewSettingsFromFile(cr_settings_file)
744 cr_settings_file.close()
745
746 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000747
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000748 @staticmethod
749 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000750 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000751
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000753 if self.root is None:
754 self.root = os.path.abspath(self.GetRelativeRoot())
755 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000756
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000757 def GetTreeStatusUrl(self, error_ok=False):
758 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000759 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
760 if self.tree_status_url is None and not error_ok:
761 DieWithError(
762 'You must configure your tree status URL by running '
763 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 return self.tree_status_url
765
766 def GetViewVCUrl(self):
767 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000768 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 return self.viewvc_url
770
rmistry@google.com90752582014-01-14 21:04:50 +0000771 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000772 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000773
rmistry@google.com5626a922015-02-26 14:03:30 +0000774 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000775 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000776 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000777 return run_post_upload_hook == "True"
778
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000779 def GetDefaultCCList(self):
Edward Lemur26964072020-02-19 19:18:51 +0000780 return self._GetConfig('rietveld.cc')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000781
Dirk Pranke6f0df682021-06-25 00:42:33 +0000782 def GetUsePython3(self):
783 return self._GetConfig('rietveld.use-python3')
784
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000785 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000786 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000787 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000788 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
789 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000790 # Default is squash now (http://crbug.com/611892#c23).
791 self.squash_gerrit_uploads = self._GetConfig(
792 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000793 return self.squash_gerrit_uploads
794
Edward Lesmes4de54132020-05-05 19:41:33 +0000795 def GetSquashGerritUploadsOverride(self):
796 """Return True or False if codereview.settings should be overridden.
797
798 Returns None if no override has been defined.
799 """
800 # See also http://crbug.com/611892#c23
801 result = self._GetConfig('gerrit.override-squash-uploads').lower()
802 if result == 'true':
803 return True
804 if result == 'false':
805 return False
806 return None
807
tandrii@chromium.org28253532016-04-14 13:46:56 +0000808 def GetGerritSkipEnsureAuthenticated(self):
809 """Return True if EnsureAuthenticated should not be done for Gerrit
810 uploads."""
811 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000812 self.gerrit_skip_ensure_authenticated = self._GetConfig(
813 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000814 return self.gerrit_skip_ensure_authenticated
815
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000816 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000817 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000818 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000819 # Git requires single quotes for paths with spaces. We need to replace
820 # them with double quotes for Windows to treat such paths as a single
821 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000822 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000823 return self.git_editor or None
824
thestig@chromium.org44202a22014-03-11 19:22:18 +0000825 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000826 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000827
828 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000829 return self._GetConfig(
830 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000831
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000832 def GetFormatFullByDefault(self):
833 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000834 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000835 result = (
836 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
837 error_ok=True).strip())
838 self.format_full_by_default = (result == 'true')
839 return self.format_full_by_default
840
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000841 def IsStatusCommitOrderByDate(self):
842 if self.is_status_commit_order_by_date is None:
843 result = (RunGit(['config', '--bool', 'cl.date-order'],
844 error_ok=True).strip())
845 self.is_status_commit_order_by_date = (result == 'true')
846 return self.is_status_commit_order_by_date
847
Edward Lemur26964072020-02-19 19:18:51 +0000848 def _GetConfig(self, key, default=''):
849 self._LazyUpdateIfNeeded()
850 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000851
852
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000853class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000854 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000855 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000856 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000857 DRY_RUN = 'dry_run'
858 COMMIT = 'commit'
859
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000860 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000861
862
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000863class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000864 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000865 self.issue = issue
866 self.patchset = patchset
867 self.hostname = hostname
868
869 @property
870 def valid(self):
871 return self.issue is not None
872
873
Edward Lemurf38bc172019-09-03 21:02:13 +0000874def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000875 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
876 fail_result = _ParsedIssueNumberArgument()
877
Edward Lemur678a6842019-10-03 22:25:05 +0000878 if isinstance(arg, int):
879 return _ParsedIssueNumberArgument(issue=arg)
880 if not isinstance(arg, basestring):
881 return fail_result
882
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000883 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000884 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700885
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000886 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000887 if not url.startswith('http'):
888 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000889 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
890 if url.startswith(short_url):
891 url = gerrit_url + url[len(short_url):]
892 break
893
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000894 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000895 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000896 except ValueError:
897 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200898
Alex Turner30ae6372022-01-04 02:32:52 +0000899 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
900 # URL.
901 if not arg.startswith('http') and '.' not in parsed_url.netloc:
902 return fail_result
903
Edward Lemur678a6842019-10-03 22:25:05 +0000904 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
905 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
906 # Short urls like https://domain/<issue_number> can be used, but don't allow
907 # specifying the patchset (you'd 404), but we allow that here.
908 if parsed_url.path == '/':
909 part = parsed_url.fragment
910 else:
911 part = parsed_url.path
912
913 match = re.match(
914 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
915 if not match:
916 return fail_result
917
918 issue = int(match.group('issue'))
919 patchset = match.group('patchset')
920 return _ParsedIssueNumberArgument(
921 issue=issue,
922 patchset=int(patchset) if patchset else None,
923 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924
925
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000926def _create_description_from_log(args):
927 """Pulls out the commit log to use as a base for the CL description."""
928 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000929 if len(args) == 1 and args[0] == None:
930 # Handle the case where None is passed as the branch.
931 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000932 if len(args) == 1 and not args[0].endswith('.'):
933 log_args = [args[0] + '..']
934 elif len(args) == 1 and args[0].endswith('...'):
935 log_args = [args[0][:-1]]
936 elif len(args) == 2:
937 log_args = [args[0] + '..' + args[1]]
938 else:
939 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000940 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000941
942
Aaron Gablea45ee112016-11-22 15:14:38 -0800943class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700944 def __init__(self, issue, url):
945 self.issue = issue
946 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800947 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700948
949 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800950 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700951 self.issue, self.url)
952
953
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100954_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000955 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100956 # TODO(tandrii): these two aren't known in Gerrit.
957 'approval', 'disapproval'])
958
959
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000960class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000961 """Changelist works with one changelist in local branch.
962
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000963 Notes:
964 * Not safe for concurrent multi-{thread,process} use.
965 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700966 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000967 """
968
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000969 def __init__(self,
970 branchref=None,
971 issue=None,
972 codereview_host=None,
973 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000974 """Create a new ChangeList instance.
975
Edward Lemurf38bc172019-09-03 21:02:13 +0000976 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000977 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000978 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000979 global settings
980 if not settings:
981 # Happens when git_cl.py is used as a utility library.
982 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000983
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000984 self.branchref = branchref
985 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000986 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +0000987 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000988 else:
989 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +0000990 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000991 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000992 self.lookedup_issue = False
993 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000995 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000996 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000997 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -0800998 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000999 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001000 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001001
Edward Lemur125d60a2019-09-13 18:25:41 +00001002 # Lazily cached values.
1003 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1004 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001005 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001006 # Map from change number (issue) to its detail cache.
1007 self._detail_cache = {}
1008
1009 if codereview_host is not None:
1010 assert not codereview_host.startswith('https://'), codereview_host
1011 self._gerrit_host = codereview_host
1012 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001013
Edward Lesmese1576912021-02-16 21:53:34 +00001014 @property
1015 def owners_client(self):
1016 if self._owners_client is None:
1017 remote, remote_branch = self.GetRemoteBranch()
1018 branch = GetTargetRef(remote, remote_branch, None)
1019 self._owners_client = owners_client.GetCodeOwnersClient(
1020 root=settings.GetRoot(),
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001021 upstream=self.GetCommonAncestorWithUpstream(),
Edward Lesmese1576912021-02-16 21:53:34 +00001022 host=self.GetGerritHost(),
1023 project=self.GetGerritProject(),
1024 branch=branch)
1025 return self._owners_client
1026
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001027 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001028 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001029
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001030 The return value is a string suitable for passing to git cl with the --cc
1031 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001032 """
1033 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001034 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001035 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001036 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1037 return self.cc
1038
Daniel Cheng7227d212017-11-17 08:12:37 -08001039 def ExtendCC(self, more_cc):
1040 """Extends the list of users to cc on this CL based on the changed files."""
1041 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001043 def GetCommitDate(self):
1044 """Returns the commit date as provided in the constructor"""
1045 return self.commit_date
1046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001048 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001050 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001051 if not branchref:
1052 return None
1053 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001054 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 return self.branch
1056
1057 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001058 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.GetBranch() # Poke the lazy loader.
1060 return self.branchref
1061
Edward Lemur85153282020-02-14 22:06:29 +00001062 def _GitGetBranchConfigValue(self, key, default=None):
1063 return scm.GIT.GetBranchConfig(
1064 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001065
Edward Lemur85153282020-02-14 22:06:29 +00001066 def _GitSetBranchConfigValue(self, key, value):
1067 action = 'set %s to %r' % (key, value)
1068 if not value:
1069 action = 'unset %s' % key
1070 assert self.GetBranch(), 'a branch is needed to ' + action
1071 return scm.GIT.SetBranchConfig(
1072 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001073
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001074 @staticmethod
1075 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001076 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001077 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001078 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001079 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1080 settings.GetRoot(), branch)
1081 if not remote or not upstream_branch:
1082 DieWithError(
1083 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001084 'Verify this branch is set up to track another \n'
1085 '(via the --track argument to "git checkout -b ..."). \n'
1086 'or pass complete "git diff"-style arguments if supported, like\n'
1087 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088
1089 return remote, upstream_branch
1090
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001091 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001092 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001093 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001094 DieWithError('The upstream for the current branch (%s) does not exist '
1095 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001096 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001097 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 def GetUpstreamBranch(self):
1100 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001101 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001102 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001103 upstream_branch = upstream_branch.replace('refs/heads/',
1104 'refs/remotes/%s/' % remote)
1105 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1106 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107 self.upstream_branch = upstream_branch
1108 return self.upstream_branch
1109
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001110 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001111 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001112 remote, branch = None, self.GetBranch()
1113 seen_branches = set()
1114 while branch not in seen_branches:
1115 seen_branches.add(branch)
1116 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001117 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001118 if remote != '.' or branch.startswith('refs/remotes'):
1119 break
1120 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001121 remotes = RunGit(['remote'], error_ok=True).split()
1122 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001123 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001124 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001126 logging.warning('Could not determine which remote this change is '
1127 'associated with, so defaulting to "%s".' %
1128 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001129 else:
Gavin Make6a62332020-12-04 21:57:10 +00001130 logging.warning('Could not determine which remote this change is '
1131 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001132 branch = 'HEAD'
1133 if branch.startswith('refs/remotes'):
1134 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001135 elif branch.startswith('refs/branch-heads/'):
1136 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001137 else:
1138 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001139 return self._remote
1140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 def GetRemoteUrl(self):
1142 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1143
1144 Returns None if there is no remote.
1145 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001146 is_cached, value = self._cached_remote_url
1147 if is_cached:
1148 return value
1149
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001150 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001151 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001152
Edward Lemur298f2cf2019-02-22 21:40:39 +00001153 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001154 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001155 if host:
1156 self._cached_remote_url = (True, url)
1157 return url
1158
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001159 # If it cannot be parsed as an url, assume it is a local directory,
1160 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001161 logging.warning('"%s" doesn\'t appear to point to a git host. '
1162 'Interpreting it as a local directory.', url)
1163 if not os.path.isdir(url):
1164 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001165 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1166 'but it doesn\'t exist.',
1167 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001168 return None
1169
1170 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001171 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001172
Edward Lemur79d4f992019-11-11 23:49:02 +00001173 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001174 if not host:
1175 logging.error(
1176 'Remote "%(remote)s" for branch "%(branch)s" points to '
1177 '"%(cache_path)s", but it is misconfigured.\n'
1178 '"%(cache_path)s" must be a git repo and must have a remote named '
1179 '"%(remote)s" pointing to the git host.', {
1180 'remote': remote,
1181 'cache_path': cache_path,
1182 'branch': self.GetBranch()})
1183 return None
1184
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001185 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001186 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001188 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001189 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001190 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001191 if self.GetBranch():
1192 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001193 if self.issue is not None:
1194 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001195 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 return self.issue
1197
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001198 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001199 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001200 issue = self.GetIssue()
1201 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001202 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001203 server = self.GetCodereviewServer()
1204 if short:
1205 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1206 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207
Dirk Pranke6f0df682021-06-25 00:42:33 +00001208 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001209 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001210
Edward Lemur6c6827c2020-02-06 21:15:18 +00001211 def FetchDescription(self, pretty=False):
1212 assert self.GetIssue(), 'issue is required to query Gerrit'
1213
Edward Lemur9aa1a962020-02-25 00:58:38 +00001214 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001215 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1216 current_rev = data['current_revision']
1217 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001218
1219 if not pretty:
1220 return self.description
1221
1222 # Set width to 72 columns + 2 space indent.
1223 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1224 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1225 lines = self.description.splitlines()
1226 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001227
1228 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001229 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001230 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001231 if self.GetBranch():
1232 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001233 if self.patchset is not None:
1234 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001235 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001236 return self.patchset
1237
Edward Lemur9aa1a962020-02-25 00:58:38 +00001238 def GetAuthor(self):
1239 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1240
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001242 """Set this branch's patchset. If patchset=0, clears the patchset."""
1243 assert self.GetBranch()
1244 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001246 else:
1247 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001248 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001250 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001251 """Set this branch's issue. If issue isn't given, clears the issue."""
1252 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001254 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001255 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001257 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001258 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001259 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001260 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 else:
tandrii5d48c322016-08-18 16:19:37 -07001262 # Reset all of these just to be clean.
1263 reset_suffixes = [
1264 'last-upload-hash',
Edward Lesmes50da7702020-03-30 19:23:43 +00001265 ISSUE_CONFIG_KEY,
1266 PATCHSET_CONFIG_KEY,
1267 CODEREVIEW_SERVER_CONFIG_KEY,
1268 'gerritsquashhash',
1269 ]
tandrii5d48c322016-08-18 16:19:37 -07001270 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001271 try:
1272 self._GitSetBranchConfigValue(prop, None)
1273 except subprocess2.CalledProcessError:
1274 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001275 msg = RunGit(['log', '-1', '--format=%B']).strip()
1276 if msg and git_footers.get_footer_change_id(msg):
1277 print('WARNING: The change patched into this branch has a Change-Id. '
1278 'Removing it.')
1279 RunGit(['commit', '--amend', '-m',
1280 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001281 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001282 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001283 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
Edward Lemur2c62b332020-03-12 22:12:33 +00001285 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001286 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001287 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001288 except subprocess2.CalledProcessError:
1289 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001290 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001291 'This branch probably doesn\'t exist anymore. To reset the\n'
1292 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001293 ' git branch --set-upstream-to origin/main %s\n'
1294 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001295 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001296
dsansomee2d6fd92016-09-08 00:10:47 -07001297 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001298 assert self.GetIssue(), 'issue is required to update description'
1299
1300 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001301 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001302 if not force:
1303 confirm_or_exit(
1304 'The description cannot be modified while the issue has a pending '
1305 'unpublished edit. Either publish the edit in the Gerrit web UI '
1306 'or delete it.\n\n', action='delete the unpublished edit')
1307
1308 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001309 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001310 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001311 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001312 description, notify='NONE')
1313
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001314 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001315
Edward Lemur75526302020-02-27 22:31:05 +00001316 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001317 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001318 '--root', settings.GetRoot(),
1319 '--upstream', upstream,
1320 ]
1321
1322 args.extend(['--verbose'] * verbose)
1323
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001324 remote, remote_branch = self.GetRemoteBranch()
1325 target_ref = GetTargetRef(remote, remote_branch, None)
1326 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1327 args.extend(['--gerrit_project', self.GetGerritProject()])
1328 args.extend(['--gerrit_branch', target_ref])
1329
Edward Lemur99df04e2020-03-05 19:39:43 +00001330 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001331 issue = self.GetIssue()
1332 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001333 if author:
1334 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001335 if issue:
1336 args.extend(['--issue', str(issue)])
1337 if patchset:
1338 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001339
Edward Lemur75526302020-02-27 22:31:05 +00001340 return args
1341
Josip Sokcevic017544d2022-03-31 23:47:53 +00001342 def RunHook(self,
1343 committing,
1344 may_prompt,
1345 verbose,
1346 parallel,
1347 upstream,
1348 description,
1349 all_files,
1350 files=None,
1351 resultdb=False,
1352 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001353 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1354 args = self._GetCommonPresubmitArgs(verbose, upstream)
1355 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001356 if may_prompt:
1357 args.append('--may_prompt')
1358 if parallel:
1359 args.append('--parallel')
1360 if all_files:
1361 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001362 if files:
1363 args.extend(files.split(';'))
1364 args.append('--source_controlled_only')
Edward Lemur227d5102020-02-25 23:45:35 +00001365
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001366 if resultdb and not realm:
1367 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1368 # it is not required to pass the realm flag
1369 print('Note: ResultDB reporting will NOT be performed because --realm'
1370 ' was not specified. To enable ResultDB, please run the command'
1371 ' again with the --realm argument to specify the LUCI realm.')
1372
1373 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1374 use_python3=False)
1375 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1376 use_python3=True)
1377 return self._MergePresubmitResults(py2_results, py3_results)
1378
1379 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1380 args = args[:]
1381 vpython = 'vpython3' if use_python3 else 'vpython'
1382
Edward Lemur227d5102020-02-25 23:45:35 +00001383 with gclient_utils.temporary_file() as description_file:
1384 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001385 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001386 args.extend(['--json_output', json_output])
1387 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001388 if self.GetUsePython3():
1389 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001390 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001391 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001392 if resultdb and realm:
1393 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001394
1395 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001396 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001397
Edward Lemur227d5102020-02-25 23:45:35 +00001398 metrics.collector.add_repeated('sub_commands', {
1399 'command': 'presubmit',
1400 'execution_time': time_time() - start,
1401 'exit_code': exit_code,
1402 })
1403
1404 if exit_code:
1405 sys.exit(exit_code)
1406
1407 json_results = gclient_utils.FileRead(json_output)
1408 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001409
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001410 def _MergePresubmitResults(self, py2_results, py3_results):
1411 return {
1412 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1413 py3_results.get('more_cc', []))),
1414 'errors': (
1415 py2_results.get('errors', []) + py3_results.get('errors', [])),
1416 'notifications': (
1417 py2_results.get('notifications', []) +
1418 py3_results.get('notifications', [])),
1419 'warnings': (
1420 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1421 }
1422
Edward Lemur75526302020-02-27 22:31:05 +00001423 def RunPostUploadHook(self, verbose, upstream, description):
1424 args = self._GetCommonPresubmitArgs(verbose, upstream)
1425 args.append('--post_upload')
1426
1427 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001428 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001429 args.extend(['--description_file', description_file])
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001430 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1431 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1432 ['--use-python3'])
1433 p_py2.wait()
1434 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001435
Edward Lemur5a644f82020-03-18 16:44:57 +00001436 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1437 # Get description message for upload.
1438 if self.GetIssue():
1439 description = self.FetchDescription()
1440 elif options.message:
1441 description = options.message
1442 else:
1443 description = _create_description_from_log(git_diff_args)
1444 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001445 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001446
Edward Lemur5a644f82020-03-18 16:44:57 +00001447 bug = options.bug
1448 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001449 if not self.GetIssue():
1450 # Extract bug number from branch name, but only if issue is being created.
1451 # It must start with bug or fix, followed by _ or - and number.
1452 # Optionally, it may contain _ or - after number with arbitrary text.
1453 # Examples:
1454 # bug-123
1455 # bug_123
1456 # fix-123
1457 # fix-123-some-description
1458 match = re.match(
1459 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1460 self.GetBranch())
1461 if not bug and not fixed and match:
1462 if match.group('type') == 'bug':
1463 bug = match.group('bugnum')
1464 else:
1465 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001466
1467 change_description = ChangeDescription(description, bug, fixed)
1468
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001469 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1470 if options.add_owners_to:
1471 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001472 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001473 files, [], options.tbrs + options.reviewers)
1474 missing_files = [
1475 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001476 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001477 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001478 owners = self.owners_client.SuggestOwners(
1479 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001480 if options.add_owners_to == 'TBR':
1481 assert isinstance(options.tbrs, list), options.tbrs
1482 options.tbrs.extend(owners)
1483 else:
1484 assert isinstance(options.reviewers, list), options.reviewers
1485 options.reviewers.extend(owners)
1486
Edward Lemur5a644f82020-03-18 16:44:57 +00001487 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001488 if options.reviewers or options.tbrs:
1489 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001490
1491 return change_description
1492
1493 def _GetTitleForUpload(self, options):
1494 # When not squashing, just return options.title.
1495 if not options.squash:
1496 return options.title
1497
1498 # On first upload, patchset title is always this string, while options.title
1499 # gets converted to first line of message.
1500 if not self.GetIssue():
1501 return 'Initial upload'
1502
1503 # When uploading subsequent patchsets, options.message is taken as the title
1504 # if options.title is not provided.
1505 if options.title:
1506 return options.title
1507 if options.message:
1508 return options.message.strip()
1509
1510 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001511 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001512 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001513 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001514 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001515
1516 # Use the default title if the user confirms the default with a 'y'.
1517 if user_title.lower() == 'y':
1518 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001519 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001520
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001521 def CMDUpload(self, options, git_diff_args, orig_args):
1522 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001523 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001524 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001525 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001526 else:
1527 if self.GetBranch() is None:
1528 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1529
1530 # Default to diffing against common ancestor of upstream branch
1531 base_branch = self.GetCommonAncestorWithUpstream()
1532 git_diff_args = [base_branch, 'HEAD']
1533
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001534 # Fast best-effort checks to abort before running potentially expensive
1535 # hooks if uploading is likely to fail anyway. Passing these checks does
1536 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001537 self.EnsureAuthenticated(force=options.force)
1538 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539
1540 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001541 watchlist = watchlists.Watchlists(settings.GetRoot())
1542 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001544 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545
Edward Lemur5a644f82020-03-18 16:44:57 +00001546 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001547 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001548 hook_results = self.RunHook(
1549 committing=False,
1550 may_prompt=not options.force,
1551 verbose=options.verbose,
1552 parallel=options.parallel,
1553 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001554 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001555 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001556 resultdb=options.resultdb,
1557 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001558 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001559
Aaron Gable13101a62018-02-09 13:20:41 -08001560 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001561 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001562 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001564 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001565 'last-upload-hash', scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001566 # Run post upload hooks, if specified.
1567 if settings.GetRunPostUploadHook():
Edward Lemur5a644f82020-03-18 16:44:57 +00001568 self.RunPostUploadHook(
1569 options.verbose, base_branch, change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001570
1571 # Upload all dependencies if specified.
1572 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001573 print()
1574 print('--dependencies has been specified.')
1575 print('All dependent local branches will be re-uploaded.')
1576 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001577 # Remove the dependencies flag from args so that we do not end up in a
1578 # loop.
1579 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001580 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001581 return ret
1582
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001583 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001584 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001585
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001586 Issue must have been already uploaded and known. Optionally allows for
1587 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001588 """
1589 assert new_state in _CQState.ALL_STATES
1590 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001591 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001592 vote_map = {
1593 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001594 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001595 _CQState.DRY_RUN: 1,
1596 _CQState.COMMIT: 2,
1597 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001598 if new_state == _CQState.QUICK_RUN:
1599 labels = {
1600 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1601 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1602 }
1603 else:
1604 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001605 notify = False if new_state == _CQState.DRY_RUN else None
1606 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001607 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001608 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001609 return 0
1610 except KeyboardInterrupt:
1611 raise
1612 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001613 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001614 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001615 ' * Your project has no CQ,\n'
1616 ' * You don\'t have permission to change the CQ state,\n'
1617 ' * There\'s a bug in this code (see stack trace below).\n'
1618 'Consider specifying which bots to trigger manually or asking your '
1619 'project owners for permissions or contacting Chrome Infra at:\n'
1620 'https://www.chromium.org/infra\n\n' %
1621 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001622 # Still raise exception so that stack trace is printed.
1623 raise
1624
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001625 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001626 # Lazy load of configs.
1627 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001628 if self._gerrit_host and '.' not in self._gerrit_host:
1629 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1630 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001631 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001632 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001633 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001634 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001635 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1636 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001637 return self._gerrit_host
1638
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001639 def _GetGitHost(self):
1640 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001641 remote_url = self.GetRemoteUrl()
1642 if not remote_url:
1643 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001644 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001645
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001646 def GetCodereviewServer(self):
1647 if not self._gerrit_server:
1648 # If we're on a branch then get the server potentially associated
1649 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001650 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001651 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001652 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001653 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001654 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001655 if not self._gerrit_server:
1656 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1657 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001658 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001659 parts[0] = parts[0] + '-review'
1660 self._gerrit_host = '.'.join(parts)
1661 self._gerrit_server = 'https://%s' % self._gerrit_host
1662 return self._gerrit_server
1663
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001664 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001665 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001666 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001667 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001668 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001669 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001670 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001671 if project.endswith('.git'):
1672 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001673 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1674 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1675 # gitiles/git-over-https protocol. E.g.,
1676 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1677 # as
1678 # https://chromium.googlesource.com/v8/v8
1679 if project.startswith('a/'):
1680 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001681 return project
1682
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001683 def _GerritChangeIdentifier(self):
1684 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1685
1686 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001687 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001688 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001689 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001690 if project:
1691 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1692 # Fall back on still unique, but less efficient change number.
1693 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001694
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001695 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001696 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001697 if settings.GetGerritSkipEnsureAuthenticated():
1698 # For projects with unusual authentication schemes.
1699 # See http://crbug.com/603378.
1700 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001701
1702 # Check presence of cookies only if using cookies-based auth method.
1703 cookie_auth = gerrit_util.Authenticator.get()
1704 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001705 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001706
Florian Mayerae510e82020-01-30 21:04:48 +00001707 remote_url = self.GetRemoteUrl()
1708 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001709 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001710 return
1711 if urllib.parse.urlparse(remote_url).scheme != 'https':
Josip906bfde2020-01-31 22:38:49 +00001712 logging.warning('Ignoring branch %(branch)s with non-https remote '
1713 '%(remote)s', {
1714 'branch': self.branch,
1715 'remote': self.GetRemoteUrl()
1716 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001717 return
1718
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001719 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001720 self.GetCodereviewServer()
1721 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001722 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001723
1724 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1725 git_auth = cookie_auth.get_auth_header(git_host)
1726 if gerrit_auth and git_auth:
1727 if gerrit_auth == git_auth:
1728 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001729 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001730 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001731 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001732 ' %s\n'
1733 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001734 ' Consider running the following command:\n'
1735 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001736 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001737 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001738 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001739 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001740 cookie_auth.get_new_password_message(git_host)))
1741 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001742 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001743 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001744
1745 missing = (
1746 ([] if gerrit_auth else [self._gerrit_host]) +
1747 ([] if git_auth else [git_host]))
1748 DieWithError('Credentials for the following hosts are required:\n'
1749 ' %s\n'
1750 'These are read from %s (or legacy %s)\n'
1751 '%s' % (
1752 '\n '.join(missing),
1753 cookie_auth.get_gitcookies_path(),
1754 cookie_auth.get_netrc_path(),
1755 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001756
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001757 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001758 if not self.GetIssue():
1759 return
1760
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001761 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001762 if status == 'ABANDONED':
1763 DieWithError(
1764 'Change %s has been abandoned, new uploads are not allowed' %
1765 (self.GetIssueURL()))
1766 if status == 'MERGED':
1767 answer = gclient_utils.AskForData(
1768 'Change %s has been submitted, new uploads are not allowed. '
1769 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1770 ).lower()
1771 if answer not in ('y', ''):
1772 DieWithError('New uploads are not allowed.')
1773 self.SetIssue()
1774 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001775
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001776 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1777 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1778 # Apparently this check is not very important? Otherwise get_auth_email
1779 # could have been added to other implementations of Authenticator.
1780 cookies_auth = gerrit_util.Authenticator.get()
1781 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001782 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001783
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001784 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001785 if self.GetIssueOwner() == cookies_user:
1786 return
1787 logging.debug('change %s owner is %s, cookies user is %s',
1788 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001789 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001790 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001791 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001792 if details['email'] == self.GetIssueOwner():
1793 return
1794 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001795 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001796 'as %s.\n'
1797 'Uploading may fail due to lack of permissions.' %
1798 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1799 confirm_or_exit(action='upload')
1800
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001802 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001803 or CQ status, assuming adherence to a common workflow.
1804
1805 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001806 * 'error' - error from review tool (including deleted issues)
1807 * 'unsent' - no reviewers added
1808 * 'waiting' - waiting for review
1809 * 'reply' - waiting for uploader to reply to review
1810 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001811 * 'dry-run' - dry-running in the CQ
1812 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001813 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001814 """
1815 if not self.GetIssue():
1816 return None
1817
1818 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001819 data = self._GetChangeDetail([
1820 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001821 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001822 return 'error'
1823
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001824 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001825 return 'closed'
1826
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001827 cq_label = data['labels'].get('Commit-Queue', {})
1828 max_cq_vote = 0
1829 for vote in cq_label.get('all', []):
1830 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1831 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001832 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001833 if max_cq_vote == 1:
1834 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001835
Aaron Gable9ab38c62017-04-06 14:36:33 -07001836 if data['labels'].get('Code-Review', {}).get('approved'):
1837 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838
1839 if not data.get('reviewers', {}).get('REVIEWER', []):
1840 return 'unsent'
1841
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001842 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001843 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001844 while messages:
1845 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001846 if (m.get('tag', '').startswith('autogenerated:cq') or
1847 m.get('tag', '').startswith('autogenerated:cv')):
1848 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001849 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001850 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001851 # Most recent message was by owner.
1852 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001853
1854 # Some reply from non-owner.
1855 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001856
1857 # Somehow there are no messages even though there are reviewers.
1858 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001859
1860 def GetMostRecentPatchset(self):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001861 if not self.GetIssue():
1862 return None
1863
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001865 patchset = data['revisions'][data['current_revision']]['_number']
1866 self.SetPatchset(patchset)
1867 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001868
Gavin Make61ccc52020-11-13 00:12:57 +00001869 def GetMostRecentDryRunPatchset(self):
1870 """Get patchsets equivalent to the most recent patchset and return
1871 the patchset with the latest dry run. If none have been dry run, return
1872 the latest patchset."""
1873 if not self.GetIssue():
1874 return None
1875
1876 data = self._GetChangeDetail(['ALL_REVISIONS'])
1877 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001878 dry_run = {int(m['_revision_number'])
1879 for m in data.get('messages', [])
1880 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001881
1882 for revision_info in sorted(data.get('revisions', {}).values(),
1883 key=lambda c: c['_number'], reverse=True):
1884 if revision_info['_number'] in dry_run:
1885 patchset = revision_info['_number']
1886 break
1887 if revision_info.get('kind', '') not in \
1888 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1889 break
1890 self.SetPatchset(patchset)
1891 return patchset
1892
Aaron Gable636b13f2017-07-14 10:42:48 -07001893 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001894 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001895 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001896 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001897
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001898 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001899 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001900 # CURRENT_REVISION is included to get the latest patchset so that
1901 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001902 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001903 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1904 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001905 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001906 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001907 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001908 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001909
1910 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001911 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001912 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001913 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001914 line_comments = file_comments.setdefault(path, [])
1915 line_comments.extend(
1916 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001917
1918 # Build dictionary of file comments for easy access and sorting later.
1919 # {author+date: {path: {patchset: {line: url+message}}}}
1920 comments = collections.defaultdict(
1921 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001922
1923 server = self.GetCodereviewServer()
1924 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1925 # /c/ is automatically added by short URL server.
1926 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1927 self.GetIssue())
1928 else:
1929 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1930
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001931 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001932 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001933 tag = comment.get('tag', '')
1934 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001935 continue
1936 key = (comment['author']['email'], comment['updated'])
1937 if comment.get('side', 'REVISION') == 'PARENT':
1938 patchset = 'Base'
1939 else:
1940 patchset = 'PS%d' % comment['patch_set']
1941 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001942 url = ('%s/%s/%s#%s%s' %
1943 (url_prefix, comment['patch_set'], path,
1944 'b' if comment.get('side') == 'PARENT' else '',
1945 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001946 comments[key][path][patchset][line] = (url, comment['message'])
1947
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001948 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001950 summary = self._BuildCommentSummary(msg, comments, readable)
1951 if summary:
1952 summaries.append(summary)
1953 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001954
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001955 @staticmethod
1956 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00001957 if 'email' not in msg['author']:
1958 # Some bot accounts may not have an email associated.
1959 return None
1960
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001961 key = (msg['author']['email'], msg['date'])
1962 # Don't bother showing autogenerated messages that don't have associated
1963 # file or line comments. this will filter out most autogenerated
1964 # messages, but will keep robot comments like those from Tricium.
1965 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1966 if is_autogenerated and not comments.get(key):
1967 return None
1968 message = msg['message']
1969 # Gerrit spits out nanoseconds.
1970 assert len(msg['date'].split('.')[-1]) == 9
1971 date = datetime.datetime.strptime(msg['date'][:-3],
1972 '%Y-%m-%d %H:%M:%S.%f')
1973 if key in comments:
1974 message += '\n'
1975 for path, patchsets in sorted(comments.get(key, {}).items()):
1976 if readable:
1977 message += '\n%s' % path
1978 for patchset, lines in sorted(patchsets.items()):
1979 for line, (url, content) in sorted(lines.items()):
1980 if line:
1981 line_str = 'Line %d' % line
1982 path_str = '%s:%d:' % (path, line)
1983 else:
1984 line_str = 'File comment'
1985 path_str = '%s:0:' % path
1986 if readable:
1987 message += '\n %s, %s: %s' % (patchset, line_str, url)
1988 message += '\n %s\n' % content
1989 else:
1990 message += '\n%s ' % path_str
1991 message += '\n%s\n' % content
1992
1993 return _CommentSummary(
1994 date=date,
1995 message=message,
1996 sender=msg['author']['email'],
1997 autogenerated=is_autogenerated,
1998 # These could be inferred from the text messages and correlated with
1999 # Code-Review label maximum, however this is not reliable.
2000 # Leaving as is until the need arises.
2001 approval=False,
2002 disapproval=False,
2003 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002004
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002005 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002006 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002007 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002008
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002009 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002010 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002011 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002012
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002013 def _GetChangeDetail(self, options=None):
2014 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002015 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002016 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002017
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002018 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002019 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002020 options.append('CURRENT_COMMIT')
2021
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002022 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002023 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002024 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002025
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002026 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2027 # Assumption: data fetched before with extra options is suitable
2028 # for return for a smaller set of options.
2029 # For example, if we cached data for
2030 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2031 # and request is for options=[CURRENT_REVISION],
2032 # THEN we can return prior cached data.
2033 if options_set.issubset(cached_options_set):
2034 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002035
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002036 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002037 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002038 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002039 except gerrit_util.GerritError as e:
2040 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002041 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002042 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002043
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002044 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002045 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002046
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002047 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002048 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002049 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002050 data = gerrit_util.GetChangeCommit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002051 self.GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002052 except gerrit_util.GerritError as e:
2053 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002054 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002055 raise
agable32978d92016-11-01 12:55:02 -07002056 return data
2057
Karen Qian40c19422019-03-13 21:28:29 +00002058 def _IsCqConfigured(self):
2059 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002060 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002061
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002062 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002063 if git_common.is_dirty_git_tree('land'):
2064 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002065
tandriid60367b2016-06-22 05:25:12 -07002066 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002067 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002068 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002069 'which can test and land changes for you. '
2070 'Are you sure you wish to bypass it?\n',
2071 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002072 differs = True
tandriic4344b52016-08-29 06:04:54 -07002073 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002074 # Note: git diff outputs nothing if there is no diff.
2075 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002076 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002077 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002078 if detail['current_revision'] == last_upload:
2079 differs = False
2080 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002081 print('WARNING: Local branch contents differ from latest uploaded '
2082 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002083 if differs:
2084 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002085 confirm_or_exit(
2086 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2087 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002088 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002089 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002090 upstream = self.GetCommonAncestorWithUpstream()
2091 if self.GetIssue():
2092 description = self.FetchDescription()
2093 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002094 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002095 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002096 committing=True,
2097 may_prompt=not force,
2098 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002099 parallel=parallel,
2100 upstream=upstream,
2101 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002102 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002103 resultdb=resultdb,
2104 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002105
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002106 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002107 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002108 links = self._GetChangeCommit().get('web_links', [])
2109 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002110 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002111 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002112 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002113 return 0
2114
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002115 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2116 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 assert parsed_issue_arg.valid
2118
Edward Lemur125d60a2019-09-13 18:25:41 +00002119 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002120
2121 if parsed_issue_arg.hostname:
2122 self._gerrit_host = parsed_issue_arg.hostname
2123 self._gerrit_server = 'https://%s' % self._gerrit_host
2124
tandriic2405f52016-10-10 08:13:15 -07002125 try:
2126 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002127 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002128 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002129
2130 if not parsed_issue_arg.patchset:
2131 # Use current revision by default.
2132 revision_info = detail['revisions'][detail['current_revision']]
2133 patchset = int(revision_info['_number'])
2134 else:
2135 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002136 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002137 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2138 break
2139 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002140 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 (parsed_issue_arg.patchset, self.GetIssue()))
2142
Edward Lemur125d60a2019-09-13 18:25:41 +00002143 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002144 if remote_url.endswith('.git'):
2145 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002146 remote_url = remote_url.rstrip('/')
2147
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002148 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002149 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002150
2151 if remote_url != fetch_info['url']:
2152 DieWithError('Trying to patch a change from %s but this repo appears '
2153 'to be %s.' % (fetch_info['url'], remote_url))
2154
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002156
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002157 # If we have created a new branch then do the "set issue" immediately in
2158 # case the cherry-pick fails, which happens when resolving conflicts.
2159 if newbranch:
2160 self.SetIssue(parsed_issue_arg.issue)
2161
Aaron Gable62619a32017-06-16 08:22:09 -07002162 if force:
2163 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2164 print('Checked out commit for change %i patchset %i locally' %
2165 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002166 elif nocommit:
2167 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2168 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002169 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002170 RunGit(['cherry-pick', 'FETCH_HEAD'])
2171 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002172 (parsed_issue_arg.issue, patchset))
2173 print('Note: this created a local commit which does not have '
2174 'the same hash as the one uploaded for review. This will make '
2175 'uploading changes based on top of this branch difficult.\n'
2176 'If you want to do that, use "git cl patch --force" instead.')
2177
Stefan Zagerd08043c2017-10-12 12:07:02 -07002178 if self.GetBranch():
2179 self.SetIssue(parsed_issue_arg.issue)
2180 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002181 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Stefan Zagerd08043c2017-10-12 12:07:02 -07002182 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2183 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2184 else:
2185 print('WARNING: You are in detached HEAD state.\n'
2186 'The patch has been applied to your checkout, but you will not be '
2187 'able to upload a new patch set to the gerrit issue.\n'
2188 'Try using the \'-b\' option if you would like to work on a '
2189 'branch and/or upload a new patch set.')
2190
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 return 0
2192
tandrii16e0b4e2016-06-07 10:34:28 -07002193 def _GerritCommitMsgHookCheck(self, offer_removal):
2194 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2195 if not os.path.exists(hook):
2196 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002197 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2198 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002199 data = gclient_utils.FileRead(hook)
2200 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2201 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002202 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002203 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002204 'and may interfere with it in subtle ways.\n'
2205 'We recommend you remove the commit-msg hook.')
2206 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002207 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002208 gclient_utils.rm_file_or_tree(hook)
2209 print('Gerrit commit-msg hook removed.')
2210 else:
2211 print('OK, will keep Gerrit commit-msg hook in place.')
2212
Edward Lemur1b52d872019-05-09 21:12:12 +00002213 def _CleanUpOldTraces(self):
2214 """Keep only the last |MAX_TRACES| traces."""
2215 try:
2216 traces = sorted([
2217 os.path.join(TRACES_DIR, f)
2218 for f in os.listdir(TRACES_DIR)
2219 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2220 and not f.startswith('tmp'))
2221 ])
2222 traces_to_delete = traces[:-MAX_TRACES]
2223 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002224 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002225 except OSError:
2226 print('WARNING: Failed to remove old git traces from\n'
2227 ' %s'
2228 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002229
Edward Lemur5737f022019-05-17 01:24:00 +00002230 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002231 """Zip and write the git push traces stored in traces_dir."""
2232 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002233 traces_zip = trace_name + '-traces'
2234 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002235 # Create a temporary dir to store git config and gitcookies in. It will be
2236 # compressed and stored next to the traces.
2237 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002238 git_info_zip = trace_name + '-git-info'
2239
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002240 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002241
Edward Lemur1b52d872019-05-09 21:12:12 +00002242 git_push_metadata['trace_name'] = trace_name
2243 gclient_utils.FileWrite(
2244 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2245
2246 # Keep only the first 6 characters of the git hashes on the packet
2247 # trace. This greatly decreases size after compression.
2248 packet_traces = os.path.join(traces_dir, 'trace-packet')
2249 if os.path.isfile(packet_traces):
2250 contents = gclient_utils.FileRead(packet_traces)
2251 gclient_utils.FileWrite(
2252 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2253 shutil.make_archive(traces_zip, 'zip', traces_dir)
2254
2255 # Collect and compress the git config and gitcookies.
2256 git_config = RunGit(['config', '-l'])
2257 gclient_utils.FileWrite(
2258 os.path.join(git_info_dir, 'git-config'),
2259 git_config)
2260
2261 cookie_auth = gerrit_util.Authenticator.get()
2262 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2263 gitcookies_path = cookie_auth.get_gitcookies_path()
2264 if os.path.isfile(gitcookies_path):
2265 gitcookies = gclient_utils.FileRead(gitcookies_path)
2266 gclient_utils.FileWrite(
2267 os.path.join(git_info_dir, 'gitcookies'),
2268 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2269 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2270
Edward Lemur1b52d872019-05-09 21:12:12 +00002271 gclient_utils.rmtree(git_info_dir)
2272
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002273 def _RunGitPushWithTraces(self,
2274 refspec,
2275 refspec_opts,
2276 git_push_metadata,
2277 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002278 """Run git push and collect the traces resulting from the execution."""
2279 # Create a temporary directory to store traces in. Traces will be compressed
2280 # and stored in a 'traces' dir inside depot_tools.
2281 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002282 trace_name = os.path.join(
2283 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002284
2285 env = os.environ.copy()
2286 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2287 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002288 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002289 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2290 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2291 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2292
2293 try:
2294 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002295 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002296 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002297 push_cmd = ['git', 'push', remote_url, refspec]
2298 if git_push_options:
2299 for opt in git_push_options:
2300 push_cmd.extend(['-o', opt])
2301
Edward Lemur0f58ae42019-04-30 17:24:12 +00002302 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002303 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002304 env=env,
2305 print_stdout=True,
2306 # Flush after every line: useful for seeing progress when running as
2307 # recipe.
2308 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002309 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002310 except subprocess2.CalledProcessError as e:
2311 push_returncode = e.returncode
Josip Sokcevic740825e2021-05-12 18:28:34 +00002312 if 'blocked keyword' in str(e.stdout):
2313 raise GitPushError(
2314 'Failed to create a change, very likely due to blocked keyword. '
2315 'Please examine output above for the reason of the failure.\n'
2316 'If this is a false positive, you can try to bypass blocked '
2317 'keyword by using push option '
2318 '-o uploadvalidator~skip, e.g.:\n'
2319 'git cl upload -o uploadvalidator~skip\n\n'
2320 'If git-cl is not working correctly, file a bug under the '
2321 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002322 if 'git push -o nokeycheck' in str(e.stdout):
2323 raise GitPushError(
2324 'Failed to create a change, very likely due to a private key being '
2325 'detected. Please examine output above for the reason of the '
2326 'failure.\n'
2327 'If this is a false positive, you can try to bypass private key '
2328 'detection by using push option '
2329 '-o nokeycheck, e.g.:\n'
2330 'git cl upload -o nokeycheck\n\n'
2331 'If git-cl is not working correctly, file a bug under the '
2332 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002333
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002334 raise GitPushError(
2335 'Failed to create a change. Please examine output above for the '
2336 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002337 'For emergencies, Googlers can escalate to '
2338 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002339 'Hint: run command below to diagnose common Git/Gerrit '
2340 'credential problems:\n'
2341 ' git cl creds-check\n'
2342 '\n'
2343 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2344 'component including the files below.\n'
2345 'Review the files before upload, since they might contain sensitive '
2346 'information.\n'
2347 'Set the Restrict-View-Google label so that they are not publicly '
2348 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002349 finally:
2350 execution_time = time_time() - before_push
2351 metrics.collector.add_repeated('sub_commands', {
2352 'command': 'git push',
2353 'execution_time': execution_time,
2354 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002355 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002356 })
2357
Edward Lemur1b52d872019-05-09 21:12:12 +00002358 git_push_metadata['execution_time'] = execution_time
2359 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002360 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002361
Edward Lemur1b52d872019-05-09 21:12:12 +00002362 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002363 gclient_utils.rmtree(traces_dir)
2364
2365 return push_stdout
2366
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002367 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2368 change_desc):
2369 """Upload the current branch to Gerrit, retry if new remote HEAD is
2370 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002371 remote, remote_branch = self.GetRemoteBranch()
2372 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2373
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002374 try:
2375 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002376 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002377 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002378 # Repository might be in the middle of transition to main branch as
2379 # default, and uploads to old default might be blocked.
2380 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002381 DieWithError(str(e), change_desc)
2382
Josip Sokcevicb631a882021-01-06 18:18:10 +00002383 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2384 self.GetGerritProject())
2385 if project_head == branch:
2386 DieWithError(str(e), change_desc)
2387 branch = project_head
2388
2389 print("WARNING: Fetching remote state and retrying upload to default "
2390 "branch...")
2391 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002392 options.edit_description = False
2393 options.force = True
2394 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002395 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2396 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002397 except GitPushError as e:
2398 DieWithError(str(e), change_desc)
2399
2400 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002401 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002403 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002404 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002405 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002406 # User requested to change description
2407 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002408 change_desc.prompt()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002409 change_id = self._GetChangeDetail()['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002410 change_desc.ensure_change_id(change_id)
Aaron Gableb56ad332017-01-06 15:24:31 -08002411 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002412 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002413 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002414 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002415 if len(change_ids) == 1:
2416 change_id = change_ids[0]
2417 else:
2418 change_id = GenerateGerritChangeId(change_desc.description)
2419 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002420
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002421 if options.preserve_tryjobs:
2422 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002423
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002424 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Edward Lemur5a644f82020-03-18 16:44:57 +00002425 parent = self._ComputeParent(
2426 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002427 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002428 with gclient_utils.temporary_file() as desc_tempfile:
2429 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2430 ref_to_push = RunGit(
2431 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002432 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002433 if options.no_add_changeid:
2434 pass
2435 else: # adding Change-Ids is okay.
2436 if not git_footers.get_footer_change_id(change_desc.description):
2437 DownloadGerritHook(False)
2438 change_desc.set_description(
2439 self._AddChangeIdToCommitMessage(change_desc.description,
2440 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002441 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002442 # For no-squash mode, we assume the remote called "origin" is the one we
2443 # want. It is not worthwhile to support different workflows for
2444 # no-squash mode.
2445 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002446 # attempt to extract the changeid from the current description
2447 # fail informatively if not possible.
2448 change_id_candidates = git_footers.get_footer_change_id(
2449 change_desc.description)
2450 if not change_id_candidates:
2451 DieWithError("Unable to extract change-id from message.")
2452 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002453
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002454 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002455 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2456 ref_to_push)]).splitlines()
2457 if len(commits) > 1:
2458 print('WARNING: This will upload %d commits. Run the following command '
2459 'to see which commits will be uploaded: ' % len(commits))
2460 print('git log %s..%s' % (parent, ref_to_push))
2461 print('You can also use `git squash-branch` to squash these into a '
2462 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002463 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002464
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002465 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002466 cc = []
2467 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2468 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2469 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002470 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002471 if len(cc) > 100:
2472 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2473 'process/lsc/lsc_workflow.md')
2474 print('WARNING: This will auto-CC %s users.' % len(cc))
2475 print('LSC may be more appropriate: %s' % lsc)
2476 print('You can also use the --no-autocc flag to disable auto-CC.')
2477 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002478 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002479 if options.cc:
2480 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002481 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002482 if change_desc.get_cced():
2483 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002484 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002485 valid_accounts = set(reviewers + cc)
2486 # TODO(crbug/877717): relax this for all hosts.
2487 else:
2488 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002489 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002490 logging.info('accounts %s are recognized, %s invalid',
2491 sorted(valid_accounts),
2492 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002493
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002494 # Extra options that can be specified at push time. Doc:
2495 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002496 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002497
Aaron Gable844cf292017-06-28 11:32:59 -07002498 # By default, new changes are started in WIP mode, and subsequent patchsets
2499 # don't send email. At any time, passing --send-mail will mark the change
2500 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002501 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002502 refspec_opts.append('ready')
2503 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002504 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002505 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002506 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002507 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002508
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002509 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002510 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002511
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002512 # Set options.title in case user was prompted in _GetTitleForUpload and
2513 # _CMDUploadChange needs to be called again.
2514 options.title = self._GetTitleForUpload(options)
2515 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002516 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002517 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002518 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002519
agablec6787972016-09-09 16:13:34 -07002520 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002521 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002522
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002523 for r in sorted(reviewers):
2524 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002525 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002526 reviewers.remove(r)
2527 else:
2528 # TODO(tandrii): this should probably be a hard failure.
2529 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2530 % r)
2531 for c in sorted(cc):
2532 # refspec option will be rejected if cc doesn't correspond to an
2533 # account, even though REST call to add such arbitrary cc may succeed.
2534 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002535 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002536 cc.remove(c)
2537
rmistry9eadede2016-09-19 11:22:43 -07002538 if options.topic:
2539 # Documentation on Gerrit topics is here:
2540 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002541 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002542
Edward Lemur687ca902018-12-05 02:30:30 +00002543 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002544 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002545 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002546 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002547 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002548 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002549 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002550 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002551 elif options.cq_quick_run:
2552 refspec_opts.append('l=Commit-Queue+1')
2553 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002554
2555 if change_desc.get_reviewers(tbr_only=True):
2556 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002557 self.GetGerritHost(),
2558 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002559 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002560
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002561 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002562 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002563 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002564 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002565 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2566
2567 refspec_suffix = ''
2568 if refspec_opts:
2569 refspec_suffix = '%' + ','.join(refspec_opts)
2570 assert ' ' not in refspec_suffix, (
2571 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2572 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002573
Edward Lemur1b52d872019-05-09 21:12:12 +00002574 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002575 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002576 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002577 'change_id': change_id,
2578 'description': change_desc.description,
2579 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002580
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002581 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002582 git_push_metadata,
2583 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002584
2585 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002586 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002587 change_numbers = [m.group(1)
2588 for m in map(regex.match, push_stdout.splitlines())
2589 if m]
2590 if len(change_numbers) != 1:
2591 DieWithError(
2592 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002593 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002594 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002595 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002596
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002597 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002598 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002599 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002600 gerrit_util.AddReviewers(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002601 self.GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002602 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002603 reviewers, cc,
2604 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002605
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002606 return 0
2607
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002608 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2609 change_desc):
2610 """Computes parent of the generated commit to be uploaded to Gerrit.
2611
2612 Returns revision or a ref name.
2613 """
2614 if custom_cl_base:
2615 # Try to avoid creating additional unintended CLs when uploading, unless
2616 # user wants to take this risk.
2617 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2618 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2619 local_ref_of_target_remote])
2620 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002621 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002622 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2623 'If you proceed with upload, more than 1 CL may be created by '
2624 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2625 'If you are certain that specified base `%s` has already been '
2626 'uploaded to Gerrit as another CL, you may proceed.\n' %
2627 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2628 if not force:
2629 confirm_or_exit(
2630 'Do you take responsibility for cleaning up potential mess '
2631 'resulting from proceeding with upload?',
2632 action='upload')
2633 return custom_cl_base
2634
Aaron Gablef97e33d2017-03-30 15:44:27 -07002635 if remote != '.':
2636 return self.GetCommonAncestorWithUpstream()
2637
2638 # If our upstream branch is local, we base our squashed commit on its
2639 # squashed version.
2640 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2641
Aaron Gablef97e33d2017-03-30 15:44:27 -07002642 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002643 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002644 if upstream_branch_name == 'main':
2645 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002646
2647 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002648 # TODO(tandrii): consider checking parent change in Gerrit and using its
2649 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2650 # the tree hash of the parent branch. The upside is less likely bogus
2651 # requests to reupload parent change just because it's uploadhash is
2652 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Edward Lesmesa680c232020-03-31 18:26:44 +00002653 parent = scm.GIT.GetBranchConfig(
2654 settings.GetRoot(), upstream_branch_name, 'gerritsquashhash')
Aaron Gablef97e33d2017-03-30 15:44:27 -07002655 # Verify that the upstream branch has been uploaded too, otherwise
2656 # Gerrit will create additional CLs when uploading.
2657 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2658 RunGitSilent(['rev-parse', parent + ':'])):
2659 DieWithError(
2660 '\nUpload upstream branch %s first.\n'
2661 'It is likely that this branch has been rebased since its last '
2662 'upload, so you just need to upload it again.\n'
2663 '(If you uploaded it with --no-squash, then branch dependencies '
2664 'are not supported, and you should reupload with --squash.)'
2665 % upstream_branch_name,
2666 change_desc)
2667 return parent
2668
Edward Lemura12175c2020-03-09 16:58:26 +00002669 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002670 """Re-commits using the current message, assumes the commit hook is in
2671 place.
2672 """
Edward Lemura12175c2020-03-09 16:58:26 +00002673 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002674 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002675 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002676 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002677 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002678
2679 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002680
tandriie113dfd2016-10-11 10:20:12 -07002681 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002682 try:
2683 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002684 except GerritChangeNotExists:
2685 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002686
2687 if data['status'] in ('ABANDONED', 'MERGED'):
2688 return 'CL %s is closed' % self.GetIssue()
2689
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002690 def GetGerritChange(self, patchset=None):
2691 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002692 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002693 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002694 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002695 data = self._GetChangeDetail(['ALL_REVISIONS'])
2696
2697 assert host and issue and patchset, 'CL must be uploaded first'
2698
2699 has_patchset = any(
2700 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002701 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002702 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002703 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002704 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002705
tandrii8c5a3532016-11-04 07:52:02 -07002706 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002707 'host': host,
2708 'change': issue,
2709 'project': data['project'],
2710 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002711 }
tandriie113dfd2016-10-11 10:20:12 -07002712
tandriide281ae2016-10-12 06:02:30 -07002713 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002714 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002715
Edward Lemur707d70b2018-02-07 00:50:14 +01002716 def GetReviewers(self):
2717 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002718 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002719
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002720
Lei Zhang8a0efc12020-08-05 19:58:45 +00002721def _get_bug_line_values(default_project_prefix, bugs):
2722 """Given default_project_prefix and comma separated list of bugs, yields bug
2723 line values.
tandriif9aefb72016-07-01 09:06:51 -07002724
2725 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002726 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002727 * string, which is left as is.
2728
2729 This function may produce more than one line, because bugdroid expects one
2730 project per line.
2731
Lei Zhang8a0efc12020-08-05 19:58:45 +00002732 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002733 ['v8:123', 'chromium:789']
2734 """
2735 default_bugs = []
2736 others = []
2737 for bug in bugs.split(','):
2738 bug = bug.strip()
2739 if bug:
2740 try:
2741 default_bugs.append(int(bug))
2742 except ValueError:
2743 others.append(bug)
2744
2745 if default_bugs:
2746 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002747 if default_project_prefix:
2748 if not default_project_prefix.endswith(':'):
2749 default_project_prefix += ':'
2750 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002751 else:
2752 yield default_bugs
2753 for other in sorted(others):
2754 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2755 yield other
2756
2757
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002758class ChangeDescription(object):
2759 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002760 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002761 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002762 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002763 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002764 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002765 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2766 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002767 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002768 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002769
Dan Beamd8b04ca2019-10-10 21:23:26 +00002770 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002771 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002772 if bug:
2773 regexp = re.compile(self.BUG_LINE)
2774 prefix = settings.GetBugPrefix()
2775 if not any((regexp.match(line) for line in self._description_lines)):
2776 values = list(_get_bug_line_values(prefix, bug))
2777 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002778 if fixed:
2779 regexp = re.compile(self.FIXED_LINE)
2780 prefix = settings.GetBugPrefix()
2781 if not any((regexp.match(line) for line in self._description_lines)):
2782 values = list(_get_bug_line_values(prefix, fixed))
2783 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002784
agable@chromium.org42c20792013-09-12 17:34:49 +00002785 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002786 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002787 return '\n'.join(self._description_lines)
2788
2789 def set_description(self, desc):
2790 if isinstance(desc, basestring):
2791 lines = desc.splitlines()
2792 else:
2793 lines = [line.rstrip() for line in desc]
2794 while lines and not lines[0]:
2795 lines.pop(0)
2796 while lines and not lines[-1]:
2797 lines.pop(-1)
2798 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799
Edward Lemur5a644f82020-03-18 16:44:57 +00002800 def ensure_change_id(self, change_id):
2801 description = self.description
2802 footer_change_ids = git_footers.get_footer_change_id(description)
2803 # Make sure that the Change-Id in the description matches the given one.
2804 if footer_change_ids != [change_id]:
2805 if footer_change_ids:
2806 # Remove any existing Change-Id footers since they don't match the
2807 # expected change_id footer.
2808 description = git_footers.remove_footer(description, 'Change-Id')
2809 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2810 'if you want to set a new one.')
2811 # Add the expected Change-Id footer.
2812 description = git_footers.add_footer_change_id(description, change_id)
2813 self.set_description(description)
2814
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002815 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002816 """Rewrites the R=/TBR= line(s) as a single line each.
2817
2818 Args:
2819 reviewers (list(str)) - list of additional emails to use for reviewers.
2820 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002821 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002822 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002823 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002824
2825 reviewers = set(reviewers)
2826 tbrs = set(tbrs)
2827 LOOKUP = {
2828 'TBR': tbrs,
2829 'R': reviewers,
2830 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002831
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002832 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002833 regexp = re.compile(self.R_LINE)
2834 matches = [regexp.match(line) for line in self._description_lines]
2835 new_desc = [l for i, l in enumerate(self._description_lines)
2836 if not matches[i]]
2837 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002838
agable@chromium.org42c20792013-09-12 17:34:49 +00002839 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002840
2841 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002842 for match in matches:
2843 if not match:
2844 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002845 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2846
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002847 # If any folks ended up in both groups, remove them from tbrs.
2848 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002849
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002850 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2851 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002852
2853 # Put the new lines in the description where the old first R= line was.
2854 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2855 if 0 <= line_loc < len(self._description_lines):
2856 if new_tbr_line:
2857 self._description_lines.insert(line_loc, new_tbr_line)
2858 if new_r_line:
2859 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002860 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002861 if new_r_line:
2862 self.append_footer(new_r_line)
2863 if new_tbr_line:
2864 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002865
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002866 def set_preserve_tryjobs(self):
2867 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2868 footers = git_footers.parse_footers(self.description)
2869 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2870 if v.lower() == 'true':
2871 return
2872 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2873
Anthony Polito8b955342019-09-24 19:01:36 +00002874 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002875 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002876 self.set_description([
2877 '# Enter a description of the change.',
2878 '# This will be displayed on the codereview site.',
2879 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002880 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002881 '--------------------',
2882 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002883 bug_regexp = re.compile(self.BUG_LINE)
2884 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002885 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00002886 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00002887
Dan Beamd8b04ca2019-10-10 21:23:26 +00002888 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002889 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002890
Bruce Dawsonfc487042020-10-27 19:11:37 +00002891 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00002892 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002893 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002894 if not content:
2895 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002896 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002897
Bruce Dawson2377b012018-01-11 16:46:49 -08002898 # Strip off comments and default inserted "Bug:" line.
2899 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002900 (line.startswith('#') or
2901 line.rstrip() == "Bug:" or
2902 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002903 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002904 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002905 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002906
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002907 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002908 """Adds a footer line to the description.
2909
2910 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2911 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2912 that Gerrit footers are always at the end.
2913 """
2914 parsed_footer_line = git_footers.parse_footer(line)
2915 if parsed_footer_line:
2916 # Line is a gerrit footer in the form: Footer-Key: any value.
2917 # Thus, must be appended observing Gerrit footer rules.
2918 self.set_description(
2919 git_footers.add_footer(self.description,
2920 key=parsed_footer_line[0],
2921 value=parsed_footer_line[1]))
2922 return
2923
2924 if not self._description_lines:
2925 self._description_lines.append(line)
2926 return
2927
2928 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2929 if gerrit_footers:
2930 # git_footers.split_footers ensures that there is an empty line before
2931 # actual (gerrit) footers, if any. We have to keep it that way.
2932 assert top_lines and top_lines[-1] == ''
2933 top_lines, separator = top_lines[:-1], top_lines[-1:]
2934 else:
2935 separator = [] # No need for separator if there are no gerrit_footers.
2936
2937 prev_line = top_lines[-1] if top_lines else ''
2938 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2939 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2940 top_lines.append('')
2941 top_lines.append(line)
2942 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002943
tandrii99a72f22016-08-17 14:33:24 -07002944 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002945 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002946 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002947 reviewers = [match.group(2).strip()
2948 for match in matches
2949 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002950 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002951
bradnelsond975b302016-10-23 12:20:23 -07002952 def get_cced(self):
2953 """Retrieves the list of reviewers."""
2954 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
2955 cced = [match.group(2).strip() for match in matches if match]
2956 return cleanup_list(cced)
2957
Nodir Turakulov23b82142017-11-16 11:04:25 -08002958 def get_hash_tags(self):
2959 """Extracts and sanitizes a list of Gerrit hashtags."""
2960 subject = (self._description_lines or ('',))[0]
2961 subject = re.sub(
2962 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
2963
2964 tags = []
2965 start = 0
2966 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
2967 while True:
2968 m = bracket_exp.match(subject, start)
2969 if not m:
2970 break
2971 tags.append(self.sanitize_hash_tag(m.group(1)))
2972 start = m.end()
2973
2974 if not tags:
2975 # Try "Tag: " prefix.
2976 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
2977 if m:
2978 tags.append(self.sanitize_hash_tag(m.group(1)))
2979 return tags
2980
2981 @classmethod
2982 def sanitize_hash_tag(cls, tag):
2983 """Returns a sanitized Gerrit hash tag.
2984
2985 A sanitized hashtag can be used as a git push refspec parameter value.
2986 """
2987 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
2988
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002989
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002990def FindCodereviewSettingsFile(filename='codereview.settings'):
2991 """Finds the given file starting in the cwd and going up.
2992
2993 Only looks up to the top of the repository unless an
2994 'inherit-review-settings-ok' file exists in the root of the repository.
2995 """
2996 inherit_ok_file = 'inherit-review-settings-ok'
2997 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002998 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3000 root = '/'
3001 while True:
3002 if filename in os.listdir(cwd):
3003 if os.path.isfile(os.path.join(cwd, filename)):
3004 return open(os.path.join(cwd, filename))
3005 if cwd == root:
3006 break
3007 cwd = os.path.dirname(cwd)
3008
3009
3010def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003011 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003012 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003014 def SetProperty(name, setting, unset_error_ok=False):
3015 fullname = 'rietveld.' + name
3016 if setting in keyvals:
3017 RunGit(['config', fullname, keyvals[setting]])
3018 else:
3019 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3020
tandrii48df5812016-10-17 03:55:37 -07003021 if not keyvals.get('GERRIT_HOST', False):
3022 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003023 # Only server setting is required. Other settings can be absent.
3024 # In that case, we ignore errors raised during option deletion attempt.
3025 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3026 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3027 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003028 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003029 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3030 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003031 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3032 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003033 SetProperty(
3034 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003035 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003036
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003037 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003038 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003039
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003040 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003041 RunGit(['config', 'gerrit.squash-uploads',
3042 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003043
tandrii@chromium.org28253532016-04-14 13:46:56 +00003044 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003045 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003046 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3047
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003048 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003049 # should be of the form
3050 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3051 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003052 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3053 keyvals['ORIGIN_URL_CONFIG']])
3054
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003055
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003056def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003057 """Downloads a network object to a local file, like urllib.urlretrieve.
3058
3059 This is necessary because urllib is broken for SSL connections via a proxy.
3060 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003061 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003062 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003063
3064
ukai@chromium.org712d6102013-11-27 00:52:58 +00003065def hasSheBang(fname):
3066 """Checks fname is a #! script."""
3067 with open(fname) as f:
3068 return f.read(2).startswith('#!')
3069
3070
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003071def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003072 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003073
3074 Args:
3075 force: True to update hooks. False to install hooks if not present.
3076 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003077 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003078 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3079 if not os.access(dst, os.X_OK):
3080 if os.path.exists(dst):
3081 if not force:
3082 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003083 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003084 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003085 if not hasSheBang(dst):
3086 DieWithError('Not a script: %s\n'
3087 'You need to download from\n%s\n'
3088 'into .git/hooks/commit-msg and '
3089 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003090 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3091 except Exception:
3092 if os.path.exists(dst):
3093 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003094 DieWithError('\nFailed to download hooks.\n'
3095 'You need to download from\n%s\n'
3096 'into .git/hooks/commit-msg and '
3097 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003098
3099
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003100class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003101 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003102
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003103 _GOOGLESOURCE = 'googlesource.com'
3104
3105 def __init__(self):
3106 # Cached list of [host, identity, source], where source is either
3107 # .gitcookies or .netrc.
3108 self._all_hosts = None
3109
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003110 def ensure_configured_gitcookies(self):
3111 """Runs checks and suggests fixes to make git use .gitcookies from default
3112 path."""
3113 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3114 configured_path = RunGitSilent(
3115 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003116 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003117 if configured_path:
3118 self._ensure_default_gitcookies_path(configured_path, default)
3119 else:
3120 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003121
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003122 @staticmethod
3123 def _ensure_default_gitcookies_path(configured_path, default_path):
3124 assert configured_path
3125 if configured_path == default_path:
3126 print('git is already configured to use your .gitcookies from %s' %
3127 configured_path)
3128 return
3129
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003130 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003131 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3132 (configured_path, default_path))
3133
3134 if not os.path.exists(configured_path):
3135 print('However, your configured .gitcookies file is missing.')
3136 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3137 action='reconfigure')
3138 RunGit(['config', '--global', 'http.cookiefile', default_path])
3139 return
3140
3141 if os.path.exists(default_path):
3142 print('WARNING: default .gitcookies file already exists %s' %
3143 default_path)
3144 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3145 default_path)
3146
3147 confirm_or_exit('Move existing .gitcookies to default location?',
3148 action='move')
3149 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003150 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003151 print('Moved and reconfigured git to use .gitcookies from %s' %
3152 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003153
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003154 @staticmethod
3155 def _configure_gitcookies_path(default_path):
3156 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3157 if os.path.exists(netrc_path):
3158 print('You seem to be using outdated .netrc for git credentials: %s' %
3159 netrc_path)
3160 print('This tool will guide you through setting up recommended '
3161 '.gitcookies store for git credentials.\n'
3162 '\n'
3163 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3164 ' git config --global --unset http.cookiefile\n'
3165 ' mv %s %s.backup\n\n' % (default_path, default_path))
3166 confirm_or_exit(action='setup .gitcookies')
3167 RunGit(['config', '--global', 'http.cookiefile', default_path])
3168 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003169
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003170 def get_hosts_with_creds(self, include_netrc=False):
3171 if self._all_hosts is None:
3172 a = gerrit_util.CookiesAuthenticator()
3173 self._all_hosts = [
3174 (h, u, s)
3175 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003176 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3177 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003178 )
3179 if h.endswith(self._GOOGLESOURCE)
3180 ]
3181
3182 if include_netrc:
3183 return self._all_hosts
3184 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3185
3186 def print_current_creds(self, include_netrc=False):
3187 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3188 if not hosts:
3189 print('No Git/Gerrit credentials found')
3190 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003191 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003192 header = [('Host', 'User', 'Which file'),
3193 ['=' * l for l in lengths]]
3194 for row in (header + hosts):
3195 print('\t'.join((('%%+%ds' % l) % s)
3196 for l, s in zip(lengths, row)))
3197
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003198 @staticmethod
3199 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003200 """Parses identity "git-<username>.domain" into <username> and domain."""
3201 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003202 # distinguishable from sub-domains. But we do know typical domains:
3203 if identity.endswith('.chromium.org'):
3204 domain = 'chromium.org'
3205 username = identity[:-len('.chromium.org')]
3206 else:
3207 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003208 if username.startswith('git-'):
3209 username = username[len('git-'):]
3210 return username, domain
3211
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003212 def _canonical_git_googlesource_host(self, host):
3213 """Normalizes Gerrit hosts (with '-review') to Git host."""
3214 assert host.endswith(self._GOOGLESOURCE)
3215 # Prefix doesn't include '.' at the end.
3216 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3217 if prefix.endswith('-review'):
3218 prefix = prefix[:-len('-review')]
3219 return prefix + '.' + self._GOOGLESOURCE
3220
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003221 def _canonical_gerrit_googlesource_host(self, host):
3222 git_host = self._canonical_git_googlesource_host(host)
3223 prefix = git_host.split('.', 1)[0]
3224 return prefix + '-review.' + self._GOOGLESOURCE
3225
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003226 def _get_counterpart_host(self, host):
3227 assert host.endswith(self._GOOGLESOURCE)
3228 git = self._canonical_git_googlesource_host(host)
3229 gerrit = self._canonical_gerrit_googlesource_host(git)
3230 return git if gerrit == host else gerrit
3231
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003232 def has_generic_host(self):
3233 """Returns whether generic .googlesource.com has been configured.
3234
3235 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3236 """
3237 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3238 if host == '.' + self._GOOGLESOURCE:
3239 return True
3240 return False
3241
3242 def _get_git_gerrit_identity_pairs(self):
3243 """Returns map from canonic host to pair of identities (Git, Gerrit).
3244
3245 One of identities might be None, meaning not configured.
3246 """
3247 host_to_identity_pairs = {}
3248 for host, identity, _ in self.get_hosts_with_creds():
3249 canonical = self._canonical_git_googlesource_host(host)
3250 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3251 idx = 0 if canonical == host else 1
3252 pair[idx] = identity
3253 return host_to_identity_pairs
3254
3255 def get_partially_configured_hosts(self):
3256 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003257 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003258 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003259 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003260
3261 def get_conflicting_hosts(self):
3262 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003263 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003264 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003265 if None not in (i1, i2) and i1 != i2)
3266
3267 def get_duplicated_hosts(self):
3268 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003269 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003270
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003271
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003272 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003273 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003274 hosts = sorted(hosts)
3275 assert hosts
3276 if extra_column_func is None:
3277 extras = [''] * len(hosts)
3278 else:
3279 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003280 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3281 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003282 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003283 lines.append(tmpl % he)
3284 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003285
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003286 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003287 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003288 yield ('.googlesource.com wildcard record detected',
3289 ['Chrome Infrastructure team recommends to list full host names '
3290 'explicitly.'],
3291 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003292
3293 dups = self.get_duplicated_hosts()
3294 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003295 yield ('The following hosts were defined twice',
3296 self._format_hosts(dups),
3297 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003298
3299 partial = self.get_partially_configured_hosts()
3300 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003301 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3302 'These hosts are missing',
3303 self._format_hosts(partial, lambda host: 'but %s defined' %
3304 self._get_counterpart_host(host)),
3305 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003306
3307 conflicting = self.get_conflicting_hosts()
3308 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003309 yield ('The following Git hosts have differing credentials from their '
3310 'Gerrit counterparts',
3311 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3312 tuple(self._get_git_gerrit_identity_pairs()[host])),
3313 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003314
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003315 def find_and_report_problems(self):
3316 """Returns True if there was at least one problem, else False."""
3317 found = False
3318 bad_hosts = set()
3319 for title, sublines, hosts in self._find_problems():
3320 if not found:
3321 found = True
3322 print('\n\n.gitcookies problem report:\n')
3323 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003324 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003325 if sublines:
3326 print()
3327 print(' %s' % '\n '.join(sublines))
3328 print()
3329
3330 if bad_hosts:
3331 assert found
3332 print(' You can manually remove corresponding lines in your %s file and '
3333 'visit the following URLs with correct account to generate '
3334 'correct credential lines:\n' %
3335 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3336 print(' %s' % '\n '.join(sorted(set(
3337 gerrit_util.CookiesAuthenticator().get_new_password_url(
3338 self._canonical_git_googlesource_host(host))
3339 for host in bad_hosts
3340 ))))
3341 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003342
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003343
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003344@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003345def CMDcreds_check(parser, args):
3346 """Checks credentials and suggests changes."""
3347 _, _ = parser.parse_args(args)
3348
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003349 # Code below checks .gitcookies. Abort if using something else.
3350 authn = gerrit_util.Authenticator.get()
3351 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003352 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003353 'This command is not designed for bot environment. It checks '
3354 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003355 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3356 if isinstance(authn, gerrit_util.GceAuthenticator):
3357 message += (
3358 '\n'
3359 'If you need to run this on GCE or a cloudtop instance, '
3360 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3361 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003362
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003363 checker = _GitCookiesChecker()
3364 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003365
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003366 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003367 checker.print_current_creds(include_netrc=True)
3368
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003369 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003370 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003371 return 0
3372 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003373
3374
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003375@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003376def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003377 """Gets or sets base-url for this branch."""
Edward Lesmes50da7702020-03-30 19:23:43 +00003378 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003379 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003380 _, args = parser.parse_args(args)
3381 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003382 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003383 return RunGit(['config', 'branch.%s.base-url' % branch],
3384 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003385
3386 print('Setting base-url to %s' % args[0])
3387 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3388 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003389
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003390
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003391def color_for_status(status):
3392 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003393 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003394 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003395 'unsent': BOLD + Fore.YELLOW,
3396 'waiting': BOLD + Fore.RED,
3397 'reply': BOLD + Fore.YELLOW,
3398 'not lgtm': BOLD + Fore.RED,
3399 'lgtm': BOLD + Fore.GREEN,
3400 'commit': BOLD + Fore.MAGENTA,
3401 'closed': BOLD + Fore.CYAN,
3402 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003403 }.get(status, Fore.WHITE)
3404
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003405
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003406def get_cl_statuses(changes, fine_grained, max_processes=None):
3407 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003408
3409 If fine_grained is true, this will fetch CL statuses from the server.
3410 Otherwise, simply indicate if there's a matching url for the given branches.
3411
3412 If max_processes is specified, it is used as the maximum number of processes
3413 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3414 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003415
3416 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003417 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003418 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003419 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003420
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003421 if not fine_grained:
3422 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003423 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003424 for cl in changes:
3425 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003426 return
3427
3428 # First, sort out authentication issues.
3429 logging.debug('ensuring credentials exist')
3430 for cl in changes:
3431 cl.EnsureAuthenticated(force=False, refresh=True)
3432
3433 def fetch(cl):
3434 try:
3435 return (cl, cl.GetStatus())
3436 except:
3437 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003438 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003439 raise
3440
3441 threads_count = len(changes)
3442 if max_processes:
3443 threads_count = max(1, min(threads_count, max_processes))
3444 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3445
Edward Lemur61bf4172020-02-24 23:22:37 +00003446 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003447 fetched_cls = set()
3448 try:
3449 it = pool.imap_unordered(fetch, changes).__iter__()
3450 while True:
3451 try:
3452 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003453 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003454 break
3455 fetched_cls.add(cl)
3456 yield cl, status
3457 finally:
3458 pool.close()
3459
3460 # Add any branches that failed to fetch.
3461 for cl in set(changes) - fetched_cls:
3462 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003463
rmistry@google.com2dd99862015-06-22 12:22:18 +00003464
Jose Lopes3863fc52020-04-07 17:00:25 +00003465def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003466 """Uploads CLs of local branches that are dependents of the current branch.
3467
3468 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003469
3470 test1 -> test2.1 -> test3.1
3471 -> test3.2
3472 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003473
3474 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3475 run on the dependent branches in this order:
3476 test2.1, test3.1, test3.2, test2.2, test3.3
3477
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003478 Note: This function does not rebase your local dependent branches. Use it
3479 when you make a change to the parent branch that will not conflict
3480 with its dependent branches, and you would like their dependencies
3481 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003482 """
3483 if git_common.is_dirty_git_tree('upload-branch-deps'):
3484 return 1
3485
3486 root_branch = cl.GetBranch()
3487 if root_branch is None:
3488 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3489 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003490 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003491 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3492 'patchset dependencies without an uploaded CL.')
3493
3494 branches = RunGit(['for-each-ref',
3495 '--format=%(refname:short) %(upstream:short)',
3496 'refs/heads'])
3497 if not branches:
3498 print('No local branches found.')
3499 return 0
3500
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003501 # Create a dictionary of all local branches to the branches that are
3502 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003503 tracked_to_dependents = collections.defaultdict(list)
3504 for b in branches.splitlines():
3505 tokens = b.split()
3506 if len(tokens) == 2:
3507 branch_name, tracked = tokens
3508 tracked_to_dependents[tracked].append(branch_name)
3509
vapiera7fbd5a2016-06-16 09:17:49 -07003510 print()
3511 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003512 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003513
rmistry@google.com2dd99862015-06-22 12:22:18 +00003514 def traverse_dependents_preorder(branch, padding=''):
3515 dependents_to_process = tracked_to_dependents.get(branch, [])
3516 padding += ' '
3517 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003518 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003519 dependents.append(dependent)
3520 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003521
rmistry@google.com2dd99862015-06-22 12:22:18 +00003522 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003523 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003524
3525 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003526 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003527 return 0
3528
Jose Lopes3863fc52020-04-07 17:00:25 +00003529 if not force:
3530 confirm_or_exit('This command will checkout all dependent branches and run '
3531 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003532
rmistry@google.com2dd99862015-06-22 12:22:18 +00003533 # Record all dependents that failed to upload.
3534 failures = {}
3535 # Go through all dependents, checkout the branch and upload.
3536 try:
3537 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print()
3539 print('--------------------------------------')
3540 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003541 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003542 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003543 try:
3544 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003545 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003546 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003547 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003548 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003549 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003550 finally:
3551 # Swap back to the original root branch.
3552 RunGit(['checkout', '-q', root_branch])
3553
vapiera7fbd5a2016-06-16 09:17:49 -07003554 print()
3555 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003556 for dependent_branch in dependents:
3557 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003558 print(' %s : %s' % (dependent_branch, upload_status))
3559 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003560
3561 return 0
3562
3563
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003564def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003565 """Given a proposed tag name, returns a tag name that is guaranteed to be
3566 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3567 or 'foo-3', and so on."""
3568
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003569 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003570 for suffix_num in itertools.count(1):
3571 if suffix_num == 1:
3572 to_check = proposed_tag
3573 else:
3574 to_check = '%s-%d' % (proposed_tag, suffix_num)
3575
3576 if to_check not in existing_tags:
3577 return to_check
3578
3579
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003580@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003581def CMDarchive(parser, args):
3582 """Archives and deletes branches associated with closed changelists."""
3583 parser.add_option(
3584 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003585 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003586 parser.add_option(
3587 '-f', '--force', action='store_true',
3588 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003589 parser.add_option(
3590 '-d', '--dry-run', action='store_true',
3591 help='Skip the branch tagging and removal steps.')
3592 parser.add_option(
3593 '-t', '--notags', action='store_true',
3594 help='Do not tag archived branches. '
3595 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003596 parser.add_option(
3597 '-p',
3598 '--pattern',
3599 default='git-cl-archived-{issue}-{branch}',
3600 help='Format string for archive tags. '
3601 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003602
kmarshall3bff56b2016-06-06 18:31:47 -07003603 options, args = parser.parse_args(args)
3604 if args:
3605 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003606
3607 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3608 if not branches:
3609 return 0
3610
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003611 tags = RunGit(['for-each-ref', '--format=%(refname)',
3612 'refs/tags']).splitlines() or []
3613 tags = [t.split('/')[-1] for t in tags]
3614
vapiera7fbd5a2016-06-16 09:17:49 -07003615 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003616 changes = [Changelist(branchref=b)
3617 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003618 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3619 statuses = get_cl_statuses(changes,
3620 fine_grained=True,
3621 max_processes=options.maxjobs)
3622 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003623 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3624 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003625 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003626 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003627 proposal.sort()
3628
3629 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003630 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003631 return 0
3632
Edward Lemur85153282020-02-14 22:06:29 +00003633 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003634
vapiera7fbd5a2016-06-16 09:17:49 -07003635 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003636 if options.notags:
3637 for next_item in proposal:
3638 print(' ' + next_item[0])
3639 else:
3640 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3641 for next_item in proposal:
3642 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003643
kmarshall9249e012016-08-23 12:02:16 -07003644 # Quit now on precondition failure or if instructed by the user, either
3645 # via an interactive prompt or by command line flags.
3646 if options.dry_run:
3647 print('\nNo changes were made (dry run).\n')
3648 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003649
3650 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003651 print('You are currently on a branch \'%s\' which is associated with a '
3652 'closed codereview issue, so archive cannot proceed. Please '
3653 'checkout another branch and run this command again.' %
3654 current_branch)
3655 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003656
3657 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003658 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003659 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003660 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003661 return 1
3662
3663 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003664 if not options.notags:
3665 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003666
3667 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3668 # Clean up the tag if we failed to delete the branch.
3669 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003670
vapiera7fbd5a2016-06-16 09:17:49 -07003671 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003672
3673 return 0
3674
3675
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003676@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003677def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003678 """Show status of changelists.
3679
3680 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003681 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003682 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003683 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003684 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003685 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003686 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003687 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003688
3689 Also see 'git cl comments'.
3690 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003691 parser.add_option(
3692 '--no-branch-color',
3693 action='store_true',
3694 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003695 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003696 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003697 parser.add_option('-f', '--fast', action='store_true',
3698 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003699 parser.add_option(
3700 '-j', '--maxjobs', action='store', type=int,
3701 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003702 parser.add_option(
3703 '-i', '--issue', type=int,
3704 help='Operate on this issue instead of the current branch\'s implicit '
3705 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003706 parser.add_option('-d',
3707 '--date-order',
3708 action='store_true',
3709 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003710 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003711 if args:
3712 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003713
iannuccie53c9352016-08-17 14:40:40 -07003714 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003715 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003716
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003717 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003718 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003719 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003720 if cl.GetIssue():
3721 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003722 elif options.field == 'id':
3723 issueid = cl.GetIssue()
3724 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003725 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003726 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003727 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003728 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003729 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003730 elif options.field == 'status':
3731 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003732 elif options.field == 'url':
3733 url = cl.GetIssueURL()
3734 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003736 return 0
3737
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003738 branches = RunGit([
3739 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3740 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003741 if not branches:
3742 print('No local branch found.')
3743 return 0
3744
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003745 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003746 Changelist(branchref=b, commit_date=ct)
3747 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3748 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003749 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003750 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003751 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003752 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003753
Edward Lemur85153282020-02-14 22:06:29 +00003754 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003755
3756 def FormatBranchName(branch, colorize=False):
3757 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3758 an asterisk when it is the current branch."""
3759
3760 asterisk = ""
3761 color = Fore.RESET
3762 if branch == current_branch:
3763 asterisk = "* "
3764 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003765 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003766
3767 if colorize:
3768 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003769 return asterisk + branch_name
3770
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003771 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003772
3773 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003774
3775 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003776 sorted_changes = sorted(changes,
3777 key=lambda c: c.GetCommitDate(),
3778 reverse=True)
3779 else:
3780 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3781 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003782 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003783 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003784 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003785 branch_statuses[c.GetBranch()] = status
3786 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003787 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003788 if url and (not status or status == 'error'):
3789 # The issue probably doesn't exist anymore.
3790 url += ' (broken)'
3791
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003792 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003793 # Turn off bold as well as colors.
3794 END = '\033[0m'
3795 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003796 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003797 color = ''
3798 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003799 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003800
Alan Cuttera3be9a52019-03-04 18:50:33 +00003801 branch_display = FormatBranchName(branch)
3802 padding = ' ' * (alignment - len(branch_display))
3803 if not options.no_branch_color:
3804 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003805
Alan Cuttera3be9a52019-03-04 18:50:33 +00003806 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3807 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003808
vapiera7fbd5a2016-06-16 09:17:49 -07003809 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003810 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003811 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003812 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003813 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003814 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003815 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003816 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003817 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003818 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003819 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003820 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003821 return 0
3822
3823
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003824def colorize_CMDstatus_doc():
3825 """To be called once in main() to add colors to git cl status help."""
3826 colors = [i for i in dir(Fore) if i[0].isupper()]
3827
3828 def colorize_line(line):
3829 for color in colors:
3830 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003831 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003832 indent = len(line) - len(line.lstrip(' ')) + 1
3833 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3834 return line
3835
3836 lines = CMDstatus.__doc__.splitlines()
3837 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3838
3839
phajdan.jre328cf92016-08-22 04:12:17 -07003840def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003841 if path == '-':
3842 json.dump(contents, sys.stdout)
3843 else:
3844 with open(path, 'w') as f:
3845 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003846
3847
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003848@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003849@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003851 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852
3853 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003854 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003855 parser.add_option('-r', '--reverse', action='store_true',
3856 help='Lookup the branch(es) for the specified issues. If '
3857 'no issues are specified, all branches with mapped '
3858 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003859 parser.add_option('--json',
3860 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003861 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003862
dnj@chromium.org406c4402015-03-03 17:22:28 +00003863 if options.reverse:
3864 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003865 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003866 # Reverse issue lookup.
3867 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003868
3869 git_config = {}
3870 for config in RunGit(['config', '--get-regexp',
3871 r'branch\..*issue']).splitlines():
3872 name, _space, val = config.partition(' ')
3873 git_config[name] = val
3874
dnj@chromium.org406c4402015-03-03 17:22:28 +00003875 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00003876 issue = git_config.get(
3877 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00003878 if issue:
3879 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003880 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00003881 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07003882 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003883 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003884 try:
3885 issue_num = int(issue)
3886 except ValueError:
3887 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003888 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003889 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003890 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003891 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003892 if options.json:
3893 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003894 return 0
3895
3896 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003897 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07003898 if not issue.valid:
3899 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
3900 'or no argument to list it.\n'
3901 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00003902 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003903 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003904 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00003905 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07003906 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
3907 if options.json:
3908 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00003909 'gerrit_host': cl.GetGerritHost(),
3910 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07003911 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00003912 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07003913 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003914 return 0
3915
3916
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003917@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003918def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003919 """Shows or posts review comments for any changelist."""
3920 parser.add_option('-a', '--add-comment', dest='comment',
3921 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003922 parser.add_option('-p', '--publish', action='store_true',
3923 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003924 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00003925 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003926 parser.add_option('-m', '--machine-readable', dest='readable',
3927 action='store_false', default=True,
3928 help='output comments in a format compatible with '
3929 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00003930 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07003931 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003932 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003933
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003934 issue = None
3935 if options.issue:
3936 try:
3937 issue = int(options.issue)
3938 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003939 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003940
Edward Lemur934836a2019-09-09 20:16:54 +00003941 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003942
3943 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00003944 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003945 return 0
3946
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003947 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
3948 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003949 for comment in summary:
3950 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003951 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003952 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003953 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003954 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003955 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00003956 elif comment.autogenerated:
3957 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003958 else:
3959 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003960 print('\n%s%s %s%s\n%s' % (
3961 color,
3962 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
3963 comment.sender,
3964 Fore.RESET,
3965 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
3966
smut@google.comc85ac942015-09-15 16:34:43 +00003967 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003968 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00003969 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003970 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
3971 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00003972 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003973 return 0
3974
3975
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003976@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003977@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003978def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003979 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003980 parser.add_option('-d', '--display', action='store_true',
3981 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003982 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003983 help='New description to set for this issue (- for stdin, '
3984 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003985 parser.add_option('-f', '--force', action='store_true',
3986 help='Delete any unpublished Gerrit edits for this issue '
3987 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003988
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003989 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003990
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003991 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003992 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00003993 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003994 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003995 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003996
Edward Lemur934836a2019-09-09 20:16:54 +00003997 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01003998 if target_issue_arg:
3999 kwargs['issue'] = target_issue_arg.issue
4000 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004001
4002 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004003 if not cl.GetIssue():
4004 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004005
Edward Lemur678a6842019-10-03 22:25:05 +00004006 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004007 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004008
Edward Lemur6c6827c2020-02-06 21:15:18 +00004009 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004010
smut@google.com34fb6b12015-07-13 20:03:26 +00004011 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004012 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004013 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004014
4015 if options.new_description:
4016 text = options.new_description
4017 if text == '-':
4018 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004019 elif text == '+':
4020 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004021 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004022
4023 description.set_description(text)
4024 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004025 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004026 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004027 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004028 return 0
4029
4030
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004031@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004032def CMDlint(parser, args):
4033 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004034 parser.add_option('--filter', action='append', metavar='-x,+y',
4035 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004036 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004037
4038 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004039 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004040 try:
4041 import cpplint
4042 import cpplint_chromium
4043 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004045 return 1
4046
4047 # Change the current working directory before calling lint so that it
4048 # shows the correct base.
4049 previous_cwd = os.getcwd()
4050 os.chdir(settings.GetRoot())
4051 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004052 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004053 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004054 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004055 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004056 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004057
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004058 # Process cpplint arguments, if any.
4059 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4060 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004061 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004062
Lei Zhang379d1ad2020-07-15 19:40:06 +00004063 include_regex = re.compile(settings.GetLintRegex())
4064 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004065 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4066 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004067 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004068 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004069 continue
4070
4071 if ignore_regex.match(filename):
4072 print('Ignoring file %s' % filename)
4073 continue
4074
4075 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4076 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004077 finally:
4078 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004080 if cpplint._cpplint_state.error_count != 0:
4081 return 1
4082 return 0
4083
4084
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004085@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004087 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004088 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004089 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004090 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004091 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004092 parser.add_option('--all', action='store_true',
4093 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004094 parser.add_option('--files',
4095 nargs=1,
4096 help='Semicolon-separated list of files to be marked as '
4097 'modified when executing presubmit or post-upload hooks. '
4098 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004099 parser.add_option('--parallel', action='store_true',
4100 help='Run all tests specified by input_api.RunTests in all '
4101 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004102 parser.add_option('--resultdb', action='store_true',
4103 help='Run presubmit checks in the ResultSink environment '
4104 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004105 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004106 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004107
sbc@chromium.org71437c02015-04-09 19:29:40 +00004108 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004110 return 1
4111
Edward Lemur934836a2019-09-09 20:16:54 +00004112 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004113 if args:
4114 base_branch = args[0]
4115 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004116 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004117 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004118
Gregory Nisbet29d5cf82020-02-27 08:16:58 +00004119 if cl.GetIssue():
4120 description = cl.FetchDescription()
Aaron Gable8076c282017-11-29 14:39:41 -08004121 else:
Edward Lemura12175c2020-03-09 16:58:26 +00004122 description = _create_description_from_log([base_branch])
Aaron Gable8076c282017-11-29 14:39:41 -08004123
Bruce Dawson13acea32022-05-03 22:13:08 +00004124 if not base_branch:
4125 if not options.force:
4126 print('use --force to check even when not on a branch.')
4127 return 1
4128 base_branch = 'HEAD'
4129
Josip Sokcevic017544d2022-03-31 23:47:53 +00004130 cl.RunHook(committing=not options.upload,
4131 may_prompt=False,
4132 verbose=options.verbose,
4133 parallel=options.parallel,
4134 upstream=base_branch,
4135 description=description,
4136 all_files=options.all,
4137 files=options.files,
4138 resultdb=options.resultdb,
4139 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004140 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004141
4142
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004143def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004144 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004145
4146 Works the same way as
4147 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4148 but can be called on demand on all platforms.
4149
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004150 The basic idea is to generate git hash of a state of the tree, original
4151 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004152 """
4153 lines = []
4154 tree_hash = RunGitSilent(['write-tree'])
4155 lines.append('tree %s' % tree_hash.strip())
4156 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4157 if code == 0:
4158 lines.append('parent %s' % parent.strip())
4159 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4160 lines.append('author %s' % author.strip())
4161 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4162 lines.append('committer %s' % committer.strip())
4163 lines.append('')
4164 # Note: Gerrit's commit-hook actually cleans message of some lines and
4165 # whitespace. This code is not doing this, but it clearly won't decrease
4166 # entropy.
4167 lines.append(message)
4168 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004169 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004170 return 'I%s' % change_hash.strip()
4171
4172
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004173def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004174 """Computes the remote branch ref to use for the CL.
4175
4176 Args:
4177 remote (str): The git remote for the CL.
4178 remote_branch (str): The git remote branch for the CL.
4179 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004180 """
4181 if not (remote and remote_branch):
4182 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004183
wittman@chromium.org455dc922015-01-26 20:15:50 +00004184 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004185 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004186 # refs, which are then translated into the remote full symbolic refs
4187 # below.
4188 if '/' not in target_branch:
4189 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4190 else:
4191 prefix_replacements = (
4192 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4193 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4194 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4195 )
4196 match = None
4197 for regex, replacement in prefix_replacements:
4198 match = re.search(regex, target_branch)
4199 if match:
4200 remote_branch = target_branch.replace(match.group(0), replacement)
4201 break
4202 if not match:
4203 # This is a branch path but not one we recognize; use as-is.
4204 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004205 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004206 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004207 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004208 # Handle the refs that need to land in different refs.
4209 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004210
wittman@chromium.org455dc922015-01-26 20:15:50 +00004211 # Create the true path to the remote branch.
4212 # Does the following translation:
4213 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004214 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004215 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4216 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4217 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4218 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4219 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4220 'refs/heads/')
4221 elif remote_branch.startswith('refs/remotes/branch-heads'):
4222 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004223
wittman@chromium.org455dc922015-01-26 20:15:50 +00004224 return remote_branch
4225
4226
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004227def cleanup_list(l):
4228 """Fixes a list so that comma separated items are put as individual items.
4229
4230 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4231 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4232 """
4233 items = sum((i.split(',') for i in l), [])
4234 stripped_items = (i.strip() for i in items)
4235 return sorted(filter(None, stripped_items))
4236
4237
Aaron Gable4db38df2017-11-03 14:59:07 -07004238@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004239@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004240def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004241 """Uploads the current changelist to codereview.
4242
4243 Can skip dependency patchset uploads for a branch by running:
4244 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004245 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004246 git config --unset branch.branch_name.skip-deps-uploads
4247 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004248
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004249 If the name of the checked out branch starts with "bug-" or "fix-" followed
4250 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004251 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004252
4253 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004254 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004255 [git-cl] add support for hashtags
4256 Foo bar: implement foo
4257 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004258 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004259 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4260 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004261 parser.add_option('--bypass-watchlists', action='store_true',
4262 dest='bypass_watchlists',
4263 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004264 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004265 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004266 parser.add_option('--message', '-m', dest='message',
4267 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004268 parser.add_option('-b', '--bug',
4269 help='pre-populate the bug number(s) for this issue. '
4270 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004271 parser.add_option('--message-file', dest='message_file',
4272 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004273 parser.add_option('--title', '-t', dest='title',
4274 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004275 parser.add_option('-T', '--skip-title', action='store_true',
4276 dest='skip_title',
4277 help='Use the most recent commit message as the title of '
4278 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004279 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004280 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004281 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004282 parser.add_option('--tbrs',
4283 action='append', default=[],
4284 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004285 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004286 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004287 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004288 parser.add_option('--hashtag', dest='hashtags',
4289 action='append', default=[],
4290 help=('Gerrit hashtag for new CL; '
4291 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004292 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004293 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004294 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004295 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004296 metavar='TARGET',
4297 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004298 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004299 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004300 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004301 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004302 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004303 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004304 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004305 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4306 const='TBR', help='add a set of OWNERS to TBR')
4307 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4308 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004309 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004310 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004311 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004312 'implies --send-mail')
4313 parser.add_option('-d', '--cq-dry-run',
4314 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004315 help='Send the patchset to do a CQ dry run right after '
4316 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004317 parser.add_option(
4318 '-q',
4319 '--cq-quick-run',
4320 action='store_true',
4321 default=False,
4322 help='Send the patchset to do a CQ quick run right after '
4323 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4324 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004325 parser.add_option('--set-bot-commit', action='store_true',
4326 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004327 parser.add_option('--preserve-tryjobs', action='store_true',
4328 help='instruct the CQ to let tryjobs running even after '
4329 'new patchsets are uploaded instead of canceling '
4330 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004331 parser.add_option('--dependencies', action='store_true',
4332 help='Uploads CLs of all the local branches that depend on '
4333 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004334 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4335 help='Sends your change to the CQ after an approval. Only '
4336 'works on repos that have the Auto-Submit label '
4337 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004338 parser.add_option('--parallel', action='store_true',
4339 help='Run all tests specified by input_api.RunTests in all '
4340 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004341 parser.add_option('--no-autocc', action='store_true',
4342 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004343 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004344 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004345 parser.add_option('-R', '--retry-failed', action='store_true',
4346 help='Retry failed tryjobs from old patchset immediately '
4347 'after uploading new patchset. Cannot be used with '
4348 '--use-commit-queue or --cq-dry-run.')
4349 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4350 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004351 parser.add_option('--fixed', '-x',
4352 help='List of bugs that will be commented on and marked '
4353 'fixed (pre-populates "Fixed:" tag). Same format as '
4354 '-b option / "Bug:" tag. If fixing several issues, '
4355 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004356 parser.add_option('--edit-description', action='store_true', default=False,
4357 help='Modify description before upload. Cannot be used '
4358 'with --force. It is a noop when --no-squash is set '
4359 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004360 parser.add_option('--git-completion-helper', action="store_true",
4361 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004362 parser.add_option('--resultdb', action='store_true',
4363 help='Run presubmit checks in the ResultSink environment '
4364 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004365 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004366 parser.add_option('-o',
4367 '--push-options',
4368 action='append',
4369 default=[],
4370 help='Transmit the given string to the server when '
4371 'performing git push (pass-through). See git-push '
4372 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004373 parser.add_option('--no-add-changeid',
4374 action='store_true',
4375 dest='no_add_changeid',
4376 help='Do not add change-ids to messages.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004377
rmistry@google.com2dd99862015-06-22 12:22:18 +00004378 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004379 (options, args) = parser.parse_args(args)
4380
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004381 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004382 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4383 if opt.help != optparse.SUPPRESS_HELP))
4384 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004385
sbc@chromium.org71437c02015-04-09 19:29:40 +00004386 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004387 return 1
4388
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004389 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004390 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004391 options.cc = cleanup_list(options.cc)
4392
Josipe827b0f2020-01-30 00:07:20 +00004393 if options.edit_description and options.force:
4394 parser.error('Only one of --force and --edit-description allowed')
4395
tandriib80458a2016-06-23 12:20:07 -07004396 if options.message_file:
4397 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004398 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004399 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004400
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004401 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004402 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004403 options.use_commit_queue,
4404 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004405 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4406 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004407
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004408 if options.skip_title and options.title:
4409 parser.error('Only one of --title and --skip-title allowed.')
4410
Aaron Gableedbc4132017-09-11 13:22:28 -07004411 if options.use_commit_queue:
4412 options.send_mail = True
4413
Edward Lesmes0dd54822020-03-26 18:24:25 +00004414 if options.squash is None:
4415 # Load default for user, repo, squash=true, in this order.
4416 options.squash = settings.GetSquashGerritUploads()
4417
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004418 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004419 # Warm change details cache now to avoid RPCs later, reducing latency for
4420 # developers.
4421 if cl.GetIssue():
4422 cl._GetChangeDetail(
4423 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4424
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004425 if options.retry_failed and not cl.GetIssue():
4426 print('No previous patchsets, so --retry-failed has no effect.')
4427 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004428
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004429 # cl.GetMostRecentPatchset uses cached information, and can return the last
4430 # patchset before upload. Calling it here makes it clear that it's the
4431 # last patchset before upload. Note that GetMostRecentPatchset will fail
4432 # if no CL has been uploaded yet.
4433 if options.retry_failed:
4434 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004435
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004436 ret = cl.CMDUpload(options, args, orig_args)
4437
4438 if options.retry_failed:
4439 if ret != 0:
4440 print('Upload failed, so --retry-failed has no effect.')
4441 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004442 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004443 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004444 jobs = _filter_failed_for_retry(builds)
4445 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004446 print('No failed tryjobs, so --retry-failed has no effect.')
4447 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004448 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004449
4450 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004451
4452
Francois Dorayd42c6812017-05-30 15:10:20 -04004453@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004454@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004455def CMDsplit(parser, args):
4456 """Splits a branch into smaller branches and uploads CLs.
4457
4458 Creates a branch and uploads a CL for each group of files modified in the
4459 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004460 comment, the string '$directory', is replaced with the directory containing
4461 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004462 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004463 parser.add_option('-d', '--description', dest='description_file',
4464 help='A text file containing a CL description in which '
4465 '$directory will be replaced by each CL\'s directory.')
4466 parser.add_option('-c', '--comment', dest='comment_file',
4467 help='A text file containing a CL comment.')
4468 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004469 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004470 help='List the files and reviewers for each CL that would '
4471 'be created, but don\'t create branches or CLs.')
4472 parser.add_option('--cq-dry-run', action='store_true',
4473 help='If set, will do a cq dry run for each uploaded CL. '
4474 'Please be careful when doing this; more than ~10 CLs '
4475 'has the potential to overload our build '
4476 'infrastructure. Try to upload these not during high '
4477 'load times (usually 11-3 Mountain View time). Email '
4478 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004479 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4480 default=True,
4481 help='Sends your change to the CQ after an approval. Only '
4482 'works on repos that have the Auto-Submit label '
4483 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004484 options, _ = parser.parse_args(args)
4485
4486 if not options.description_file:
4487 parser.error('No --description flag specified.')
4488
4489 def WrappedCMDupload(args):
4490 return CMDupload(OptionParser(), args)
4491
Edward Lemur2c62b332020-03-12 22:12:33 +00004492 return split_cl.SplitCl(
4493 options.description_file, options.comment_file, Changelist,
4494 WrappedCMDupload, options.dry_run, options.cq_dry_run,
4495 options.enable_auto_submit, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004496
4497
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004498@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004499@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004500def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004501 """DEPRECATED: Used to commit the current changelist via git-svn."""
4502 message = ('git-cl no longer supports committing to SVN repositories via '
4503 'git-svn. You probably want to use `git cl land` instead.')
4504 print(message)
4505 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506
4507
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004508@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004509@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004510def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004511 """Commits the current changelist via git.
4512
4513 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4514 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004515 """
4516 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4517 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004518 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004519 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004520 parser.add_option('--parallel', action='store_true',
4521 help='Run all tests specified by input_api.RunTests in all '
4522 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004523 parser.add_option('--resultdb', action='store_true',
4524 help='Run presubmit checks in the ResultSink environment '
4525 'and send results to the ResultDB database.')
4526 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004527 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004528
Edward Lemur934836a2019-09-09 20:16:54 +00004529 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004530
Robert Iannucci2e73d432018-03-14 01:10:47 -07004531 if not cl.GetIssue():
4532 DieWithError('You must upload the change first to Gerrit.\n'
4533 ' If you would rather have `git cl land` upload '
4534 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004535 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4536 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537
4538
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004539@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004540@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004542 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543 parser.add_option('-b', dest='newbranch',
4544 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004545 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004546 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004547 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004548 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004549
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004550 group = optparse.OptionGroup(
4551 parser,
4552 'Options for continuing work on the current issue uploaded from a '
4553 'different clone (e.g. different machine). Must be used independently '
4554 'from the other options. No issue number should be specified, and the '
4555 'branch must have an issue number associated with it')
4556 group.add_option('--reapply', action='store_true', dest='reapply',
4557 help='Reset the branch and reapply the issue.\n'
4558 'CAUTION: This will undo any local changes in this '
4559 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004560
4561 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004562 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004563 parser.add_option_group(group)
4564
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004566
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004567 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004568 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004569 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004570 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004571 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004572
Edward Lemur934836a2019-09-09 20:16:54 +00004573 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004574 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004575 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004576
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004577 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004578 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004579 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004580
4581 RunGit(['reset', '--hard', upstream])
4582 if options.pull:
4583 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004584
Edward Lemur678a6842019-10-03 22:25:05 +00004585 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004586 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4587 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004588
4589 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004590 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004591
Edward Lemurf38bc172019-09-03 21:02:13 +00004592 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004593 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004594 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004595
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004596 # We don't want uncommitted changes mixed up with the patch.
4597 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004598 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004600 if options.newbranch:
4601 if options.force:
4602 RunGit(['branch', '-D', options.newbranch],
4603 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004604 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004605
Edward Lemur678a6842019-10-03 22:25:05 +00004606 cl = Changelist(
4607 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004608
Edward Lemur678a6842019-10-03 22:25:05 +00004609 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004610 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004611
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004612 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4613 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614
4615
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004616def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004617 """Fetches the tree status and returns either 'open', 'closed',
4618 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004619 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004620 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004621 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004622 if status.find('closed') != -1 or status == '0':
4623 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004624
4625 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004626 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004627
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004628 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004629 return 'unset'
4630
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004631
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004632def GetTreeStatusReason():
4633 """Fetches the tree status from a json url and returns the message
4634 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004635 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004636 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004637 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004638 status = json.loads(connection.read())
4639 connection.close()
4640 return status['message']
4641
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004642
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004643@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004644def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004645 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004646 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647 status = GetTreeStatus()
4648 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004649 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004650 return 2
4651
vapiera7fbd5a2016-06-16 09:17:49 -07004652 print('The tree is %s' % status)
4653 print()
4654 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004655 if status != 'open':
4656 return 1
4657 return 0
4658
4659
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004660@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004661def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004662 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4663 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004664 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004665 '-b', '--bot', action='append',
4666 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4667 'times to specify multiple builders. ex: '
4668 '"-b win_rel -b win_layout". See '
4669 'the try server waterfall for the builders name and the tests '
4670 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004671 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004672 '-B', '--bucket', default='',
4673 help=('Buildbucket bucket to send the try requests.'))
4674 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004675 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004676 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004677 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004678 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004679 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004680 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004681 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004682 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004683 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004684 '-q',
4685 '--quick-run',
4686 action='store_true',
4687 default=False,
4688 help='trigger in quick run mode '
4689 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4690 'uick_run.md) (chromium only).')
4691 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004692 '--category', default='git_cl_try', help='Specify custom build category.')
4693 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004694 '--project',
4695 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004696 'in recipe to determine to which repository or directory to '
4697 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004698 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004699 '-p', '--property', dest='properties', action='append', default=[],
4700 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004701 'key2=value2 etc. The value will be treated as '
4702 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004703 'NOTE: using this may make your tryjob not usable for CQ, '
4704 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004706 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4707 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004708 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004709 parser.add_option(
4710 '-R', '--retry-failed', action='store_true', default=False,
4711 help='Retry failed jobs from the latest set of tryjobs. '
4712 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004713 parser.add_option(
4714 '-i', '--issue', type=int,
4715 help='Operate on this issue instead of the current branch\'s implicit '
4716 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004717 options, args = parser.parse_args(args)
4718
machenbach@chromium.org45453142015-09-15 08:45:22 +00004719 # Make sure that all properties are prop=value pairs.
4720 bad_params = [x for x in options.properties if '=' not in x]
4721 if bad_params:
4722 parser.error('Got properties with missing "=": %s' % bad_params)
4723
maruel@chromium.org15192402012-09-06 12:38:29 +00004724 if args:
4725 parser.error('Unknown arguments: %s' % args)
4726
Edward Lemur934836a2019-09-09 20:16:54 +00004727 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004728 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004729 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004730
Edward Lemurf38bc172019-09-03 21:02:13 +00004731 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004732 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004733
tandriie113dfd2016-10-11 10:20:12 -07004734 error_message = cl.CannotTriggerTryJobReason()
4735 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004736 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004737
Edward Lemur45768512020-03-02 19:03:14 +00004738 if options.bot:
4739 if options.retry_failed:
4740 parser.error('--bot is not compatible with --retry-failed.')
4741 if not options.bucket:
4742 parser.error('A bucket (e.g. "chromium/try") is required.')
4743
4744 triggered = [b for b in options.bot if 'triggered' in b]
4745 if triggered:
4746 parser.error(
4747 'Cannot schedule builds on triggered bots: %s.\n'
4748 'This type of bot requires an initial job from a parent (usually a '
4749 'builder). Schedule a job on the parent instead.\n' % triggered)
4750
4751 if options.bucket.startswith('.master'):
4752 parser.error('Buildbot masters are not supported.')
4753
4754 project, bucket = _parse_bucket(options.bucket)
4755 if project is None or bucket is None:
4756 parser.error('Invalid bucket: %s.' % options.bucket)
4757 jobs = sorted((project, bucket, bot) for bot in options.bot)
4758 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004759 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004760 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004761 if options.verbose:
4762 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004763 jobs = _filter_failed_for_retry(builds)
4764 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004765 print('There are no failed jobs in the latest set of jobs '
4766 '(patchset #%d), doing nothing.' % patchset)
4767 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004768 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004769 if num_builders > 10:
4770 confirm_or_exit('There are %d builders with failed builds.'
4771 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004772 elif options.quick_run:
4773 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4774 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004775 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004776 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004777 print('git cl try with no bots now defaults to CQ dry run.')
4778 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4779 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004780
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004781 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004782 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004783 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004784 except BuildbucketResponseException as ex:
4785 print('ERROR: %s' % ex)
4786 return 1
4787 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004788
4789
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004790@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004791def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004792 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004793 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004794 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004795 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004796 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004797 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004798 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004799 '--color', action='store_true', default=setup_color.IS_TTY,
4800 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004801 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004802 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4803 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004804 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004805 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004806 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004807 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004808 parser.add_option(
4809 '-i', '--issue', type=int,
4810 help='Operate on this issue instead of the current branch\'s implicit '
4811 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004812 options, args = parser.parse_args(args)
4813 if args:
4814 parser.error('Unrecognized args: %s' % ' '.join(args))
4815
Edward Lemur934836a2019-09-09 20:16:54 +00004816 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004817 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004818 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819
tandrii221ab252016-10-06 08:12:04 -07004820 patchset = options.patchset
4821 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004822 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004823 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004824 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004825 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004826 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004827 cl.GetIssue())
4828
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004829 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004830 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004831 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004832 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004833 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004834 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004835 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004836 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004837 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004838 return 0
4839
4840
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004841@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004842@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004843def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004844 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004845 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004846 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004847 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004848
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004849 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004850 if args:
4851 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004852 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004853 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004854 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004855 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004856
4857 # Clear configured merge-base, if there is one.
4858 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004859 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004860 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004861 return 0
4862
4863
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004864@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004865def CMDweb(parser, args):
4866 """Opens the current CL in the web browser."""
4867 _, args = parser.parse_args(args)
4868 if args:
4869 parser.error('Unrecognized args: %s' % ' '.join(args))
4870
4871 issue_url = Changelist().GetIssueURL()
4872 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004873 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004874 return 1
4875
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004876 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004877 # allows us to hide the "Created new window in existing browser session."
4878 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004879 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004880 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004881 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004882 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004883 os.open(os.devnull, os.O_RDWR)
4884 try:
4885 webbrowser.open(issue_url)
4886 finally:
4887 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004888 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004889 return 0
4890
4891
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004892@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004893def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004894 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004895 parser.add_option('-d', '--dry-run', action='store_true',
4896 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004897 parser.add_option(
4898 '-q',
4899 '--quick-run',
4900 action='store_true',
4901 help='trigger in quick run mode '
4902 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
4903 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004904 parser.add_option('-c', '--clear', action='store_true',
4905 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00004906 parser.add_option(
4907 '-i', '--issue', type=int,
4908 help='Operate on this issue instead of the current branch\'s implicit '
4909 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004910 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004911 if args:
4912 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004913 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
4914 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004915
Edward Lemur934836a2019-09-09 20:16:54 +00004916 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004917 if not cl.GetIssue():
4918 parser.error('Must upload the issue first.')
4919
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004920 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004921 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004922 elif options.quick_run:
4923 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004924 elif options.dry_run:
4925 state = _CQState.DRY_RUN
4926 else:
4927 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07004928 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004929 return 0
4930
4931
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004932@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004933def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004934 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00004935 parser.add_option(
4936 '-i', '--issue', type=int,
4937 help='Operate on this issue instead of the current branch\'s implicit '
4938 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004939 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004940 if args:
4941 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004942 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004943 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004944 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004945 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004946 cl.CloseIssue()
4947 return 0
4948
4949
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004950@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004951def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004952 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004953 parser.add_option(
4954 '--stat',
4955 action='store_true',
4956 dest='stat',
4957 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004958 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004959 if args:
4960 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004961
Edward Lemur934836a2019-09-09 20:16:54 +00004962 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004963 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004964 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004965 if not issue:
4966 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004967
Aaron Gablea718c3e2017-08-28 17:47:28 -07004968 base = cl._GitGetBranchConfigValue('last-upload-hash')
4969 if not base:
4970 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4971 if not base:
4972 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4973 revision_info = detail['revisions'][detail['current_revision']]
4974 fetch_info = revision_info['fetch']['http']
4975 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4976 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004977
Aaron Gablea718c3e2017-08-28 17:47:28 -07004978 cmd = ['git', 'diff']
4979 if options.stat:
4980 cmd.append('--stat')
4981 cmd.append(base)
4982 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004983
4984 return 0
4985
4986
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004987@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004988def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004989 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004990 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004991 '--ignore-current',
4992 action='store_true',
4993 help='Ignore the CL\'s current reviewers and start from scratch.')
4994 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00004995 '--ignore-self',
4996 action='store_true',
4997 help='Do not consider CL\'s author as an owners.')
4998 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004999 '--no-color',
5000 action='store_true',
5001 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005002 parser.add_option(
5003 '--batch',
5004 action='store_true',
5005 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005006 # TODO: Consider moving this to another command, since other
5007 # git-cl owners commands deal with owners for a given CL.
5008 parser.add_option(
5009 '--show-all',
5010 action='store_true',
5011 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005012 options, args = parser.parse_args(args)
5013
Edward Lemur934836a2019-09-09 20:16:54 +00005014 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005015 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005016
Yang Guo6e269a02019-06-26 11:17:02 +00005017 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005018 if len(args) == 0:
5019 print('No files specified for --show-all. Nothing to do.')
5020 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005021 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005022 for path in args:
5023 print('Owners for %s:' % path)
5024 print('\n'.join(
5025 ' - %s' % owner
5026 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005027 return 0
5028
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005029 if args:
5030 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005031 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005032 base_branch = args[0]
5033 else:
5034 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005035 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005036
Edward Lemur2c62b332020-03-12 22:12:33 +00005037 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005038
5039 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005040 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5041 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005042 return 0
5043
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005044 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005045 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005046 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005047 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005048 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005049 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005050 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005051
5052
Aiden Bennerc08566e2018-10-03 17:52:42 +00005053def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005054 """Generates a diff command."""
5055 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005056 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5057
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005058 if allow_prefix:
5059 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5060 # case that diff.noprefix is set in the user's git config.
5061 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5062 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005063 diff_cmd += ['--no-prefix']
5064
5065 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005066
5067 if args:
5068 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005069 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005070 diff_cmd.append(arg)
5071 else:
5072 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005073
5074 return diff_cmd
5075
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005076
Jamie Madill5e96ad12020-01-13 16:08:35 +00005077def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5078 """Runs clang-format-diff and sets a return value if necessary."""
5079
5080 if not clang_diff_files:
5081 return 0
5082
5083 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5084 # formatted. This is used to block during the presubmit.
5085 return_value = 0
5086
5087 # Locate the clang-format binary in the checkout
5088 try:
5089 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5090 except clang_format.NotFoundError as e:
5091 DieWithError(e)
5092
5093 if opts.full or settings.GetFormatFullByDefault():
5094 cmd = [clang_format_tool]
5095 if not opts.dry_run and not opts.diff:
5096 cmd.append('-i')
5097 if opts.dry_run:
5098 for diff_file in clang_diff_files:
5099 with open(diff_file, 'r') as myfile:
5100 code = myfile.read().replace('\r\n', '\n')
5101 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5102 stdout = stdout.replace('\r\n', '\n')
5103 if opts.diff:
5104 sys.stdout.write(stdout)
5105 if code != stdout:
5106 return_value = 2
5107 else:
5108 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5109 if opts.diff:
5110 sys.stdout.write(stdout)
5111 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005112 try:
5113 script = clang_format.FindClangFormatScriptInChromiumTree(
5114 'clang-format-diff.py')
5115 except clang_format.NotFoundError as e:
5116 DieWithError(e)
5117
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005118 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005119 if not opts.dry_run and not opts.diff:
5120 cmd.append('-i')
5121
5122 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005123 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005124
Edward Lesmes89624cd2020-04-06 17:51:56 +00005125 env = os.environ.copy()
5126 env['PATH'] = (
5127 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5128 stdout = RunCommand(
5129 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005130 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005131 if opts.diff:
5132 sys.stdout.write(stdout)
5133 if opts.dry_run and len(stdout) > 0:
5134 return_value = 2
5135
5136 return return_value
5137
5138
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005139def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5140 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5141 presubmit checks have failed (and returns 0 otherwise)."""
5142
5143 if not rust_diff_files:
5144 return 0
5145
5146 # Locate the rustfmt binary.
5147 try:
5148 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5149 except rustfmt.NotFoundError as e:
5150 DieWithError(e)
5151
5152 # TODO(crbug.com/1231317): Support formatting only the changed lines
5153 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5154 # https://github.com/emilio/rustfmt-format-diff
5155 cmd = [rustfmt_tool]
5156 if opts.dry_run:
5157 cmd.append('--check')
5158 cmd += rust_diff_files
5159 rustfmt_exitcode = subprocess2.call(cmd)
5160
5161 if opts.presubmit and rustfmt_exitcode != 0:
5162 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005163
5164 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005165
5166
Olivier Robin0a6b5442022-04-07 07:25:04 +00005167def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5168 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5169 that presubmit checks have failed (and returns 0 otherwise)."""
5170
5171 if not swift_diff_files:
5172 return 0
5173
5174 # Locate the swift-format binary.
5175 try:
5176 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5177 except swift_format.NotFoundError as e:
5178 DieWithError(e)
5179
5180 cmd = [swift_format_tool]
5181 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005182 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005183 else:
5184 cmd += ['format', '-i']
5185 cmd += swift_diff_files
5186 swift_format_exitcode = subprocess2.call(cmd)
5187
5188 if opts.presubmit and swift_format_exitcode != 0:
5189 return 2
5190
5191 return 0
5192
5193
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005194def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005195 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005196 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005197
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005198
enne@chromium.org555cfe42014-01-29 18:21:39 +00005199@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005200@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005201def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005202 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005203 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005204 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005205 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005206 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005207 parser.add_option('--full', action='store_true',
5208 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005209 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005210 parser.add_option('--dry-run', action='store_true',
5211 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005212 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005213 '--no-clang-format',
5214 dest='clang_format',
5215 action='store_false',
5216 default=True,
5217 help='Disables formatting of various file types using clang-format.')
5218 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005219 '--python',
5220 action='store_true',
5221 default=None,
5222 help='Enables python formatting on all python files.')
5223 parser.add_option(
5224 '--no-python',
5225 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005226 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005227 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005228 'If neither --python or --no-python are set, python files that have a '
5229 '.style.yapf file in an ancestor directory will be formatted. '
5230 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005231 parser.add_option(
5232 '--js',
5233 action='store_true',
5234 help='Format javascript code with clang-format. '
5235 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005236 parser.add_option('--diff', action='store_true',
5237 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005238 parser.add_option('--presubmit', action='store_true',
5239 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005240
5241 parser.add_option('--rust-fmt',
5242 dest='use_rust_fmt',
5243 action='store_true',
5244 default=rustfmt.IsRustfmtSupported(),
5245 help='Enables formatting of Rust file types using rustfmt.')
5246 parser.add_option(
5247 '--no-rust-fmt',
5248 dest='use_rust_fmt',
5249 action='store_false',
5250 help='Disables formatting of Rust file types using rustfmt.')
5251
Olivier Robin0a6b5442022-04-07 07:25:04 +00005252 parser.add_option(
5253 '--swift-format',
5254 dest='use_swift_format',
5255 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005256 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005257 help='Enables formatting of Swift file types using swift-format '
5258 '(macOS host only).')
5259 parser.add_option(
5260 '--no-swift-format',
5261 dest='use_swift_format',
5262 action='store_false',
5263 help='Disables formatting of Swift file types using swift-format.')
5264
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005265 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005266
Garrett Beaty91a6f332020-01-06 16:57:24 +00005267 if opts.python is not None and opts.no_python:
5268 raise parser.error('Cannot set both --python and --no-python')
5269 if opts.no_python:
5270 opts.python = False
5271
Daniel Chengc55eecf2016-12-30 03:11:02 -08005272 # Normalize any remaining args against the current path, so paths relative to
5273 # the current directory are still resolved as expected.
5274 args = [os.path.join(os.getcwd(), arg) for arg in args]
5275
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005276 # git diff generates paths against the root of the repository. Change
5277 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005278 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005279 if rel_base_path:
5280 os.chdir(rel_base_path)
5281
digit@chromium.org29e47272013-05-17 17:01:46 +00005282 # Grab the merge-base commit, i.e. the upstream commit of the current
5283 # branch when it was created or the last time it was rebased. This is
5284 # to cover the case where the user may have called "git fetch origin",
5285 # moving the origin branch to a newer commit, but hasn't rebased yet.
5286 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005287 upstream_branch = opts.upstream
5288 if not upstream_branch:
5289 cl = Changelist()
5290 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005291 if upstream_branch:
5292 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5293 upstream_commit = upstream_commit.strip()
5294
5295 if not upstream_commit:
5296 DieWithError('Could not find base commit for this branch. '
5297 'Are you in detached state?')
5298
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005299 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5300 diff_output = RunGit(changed_files_cmd)
5301 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005302 # Filter out files deleted by this CL
5303 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005304
Andreas Haas417d89c2020-02-06 10:24:27 +00005305 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005306 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005307
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005308 clang_diff_files = []
5309 if opts.clang_format:
5310 clang_diff_files = [
5311 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5312 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005313 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005314 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005315 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005316 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005317
Edward Lesmes50da7702020-03-30 19:23:43 +00005318 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005319
Jamie Madill5e96ad12020-01-13 16:08:35 +00005320 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5321 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005322
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005323 if opts.use_rust_fmt:
5324 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5325 upstream_commit)
5326 if rust_fmt_return_value == 2:
5327 return_value = 2
5328
Olivier Robin0a6b5442022-04-07 07:25:04 +00005329 if opts.use_swift_format:
5330 if sys.platform != 'darwin':
5331 DieWithError('swift-format is only supported on macOS.')
5332 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5333 upstream_commit)
5334 if swift_format_return_value == 2:
5335 return_value = 2
5336
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005337 # Similar code to above, but using yapf on .py files rather than clang-format
5338 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005339 py_explicitly_disabled = opts.python is not None and not opts.python
5340 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005341 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5342 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005343
Aiden Bennerc08566e2018-10-03 17:52:42 +00005344 # Used for caching.
5345 yapf_configs = {}
5346 for f in python_diff_files:
5347 # Find the yapf style config for the current file, defaults to depot
5348 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005349 _FindYapfConfigFile(f, yapf_configs, top_dir)
5350
5351 # Turn on python formatting by default if a yapf config is specified.
5352 # This breaks in the case of this repo though since the specified
5353 # style file is also the global default.
5354 if opts.python is None:
5355 filtered_py_files = []
5356 for f in python_diff_files:
5357 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5358 filtered_py_files.append(f)
5359 else:
5360 filtered_py_files = python_diff_files
5361
5362 # Note: yapf still seems to fix indentation of the entire file
5363 # even if line ranges are specified.
5364 # See https://github.com/google/yapf/issues/499
5365 if not opts.full and filtered_py_files:
5366 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5367
Brian Sheedyb4307d52019-12-02 19:18:17 +00005368 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5369 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5370 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005371
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005372 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005373 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5374 # Default to pep8 if not .style.yapf is found.
5375 if not yapf_style:
5376 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005377
Peter Wend9399922020-06-17 17:33:49 +00005378 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005379 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005380 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005381 else:
5382 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005383
5384 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005385
5386 has_formattable_lines = False
5387 if not opts.full:
5388 # Only run yapf over changed line ranges.
5389 for diff_start, diff_len in py_line_diffs[f]:
5390 diff_end = diff_start + diff_len - 1
5391 # Yapf errors out if diff_end < diff_start but this
5392 # is a valid line range diff for a removal.
5393 if diff_end >= diff_start:
5394 has_formattable_lines = True
5395 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5396 # If all line diffs were removals we have nothing to format.
5397 if not has_formattable_lines:
5398 continue
5399
5400 if opts.diff or opts.dry_run:
5401 cmd += ['--diff']
5402 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005403 stdout = RunCommand(cmd,
5404 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005405 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005406 cwd=top_dir,
5407 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005408 if opts.diff:
5409 sys.stdout.write(stdout)
5410 elif len(stdout) > 0:
5411 return_value = 2
5412 else:
5413 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005414 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005415
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005416 # Format GN build files. Always run on full build files for canonical form.
5417 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005418 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005419 if opts.dry_run or opts.diff:
5420 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005421 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005422 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005423 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005424 cwd=top_dir)
5425 if opts.dry_run and gn_ret == 2:
5426 return_value = 2 # Not formatted.
5427 elif opts.diff and gn_ret == 2:
5428 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005429 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005430 elif gn_ret != 0:
5431 # For non-dry run cases (and non-2 return values for dry-run), a
5432 # nonzero error code indicates a failure, probably because the file
5433 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005434 DieWithError('gn format failed on ' + gn_diff_file +
5435 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005436
Ilya Shermane081cbe2017-08-15 17:51:04 -07005437 # Skip the metrics formatting from the global presubmit hook. These files have
5438 # a separate presubmit hook that issues an error if the files need formatting,
5439 # whereas the top-level presubmit script merely issues a warning. Formatting
5440 # these files is somewhat slow, so it's important not to duplicate the work.
5441 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005442 for diff_xml in GetDiffXMLs(diff_files):
5443 xml_dir = GetMetricsDir(diff_xml)
5444 if not xml_dir:
5445 continue
5446
Ilya Shermane081cbe2017-08-15 17:51:04 -07005447 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005448 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
5449 cmd = ['vpython', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005450
5451 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5452 # command as histograms/pretty_print.py now needs a relative path argument
5453 # after splitting the histograms into multiple directories.
5454 # For example, in tools/metrics/ukm, pretty-print could be run using:
5455 # $ python pretty_print.py
5456 # But in tools/metrics/histogrmas, pretty-print should be run with an
5457 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005458 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005459 # $ python pretty_print.py enums.xml
5460
5461 # TODO (crbug/1116488): Remove this check after ensuring that the updated
5462 # version of histograms/pretty_print.py is released.
5463 filepath_required = os.path.exists(
5464 os.path.join(tool_dir, 'validate_prefix.py'))
5465
Weilun Shib92c4b72020-08-27 17:45:11 +00005466 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
5467 or diff_xml.endswith('histogram_suffixes_list.xml')
5468 ) and filepath_required:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005469 cmd.append(diff_xml)
5470
Ilya Shermane081cbe2017-08-15 17:51:04 -07005471 if opts.dry_run or opts.diff:
5472 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005473
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005474 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5475 # `shell` param and instead replace `'vpython'` with
5476 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005477 stdout = RunCommand(cmd,
5478 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005479 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005480 if opts.diff:
5481 sys.stdout.write(stdout)
5482 if opts.dry_run and stdout:
5483 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005484
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005485 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005486
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005487
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005488def GetDiffXMLs(diff_files):
5489 return [
5490 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5491 ]
5492
5493
5494def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005495 metrics_xml_dirs = [
5496 os.path.join('tools', 'metrics', 'actions'),
5497 os.path.join('tools', 'metrics', 'histograms'),
5498 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005499 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005500 os.path.join('tools', 'metrics', 'ukm'),
5501 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005502 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005503 if diff_xml.startswith(xml_dir):
5504 return xml_dir
5505 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005506
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005507
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005508@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005509@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005510def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005511 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005512 _, args = parser.parse_args(args)
5513
5514 if len(args) != 1:
5515 parser.print_help()
5516 return 1
5517
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005518 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005519 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005520 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005521
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005522 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005523
Edward Lemur52969c92020-02-06 18:15:28 +00005524 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005525 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005526 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005527
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005528 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005529 for key, issue in [x.split() for x in output.splitlines()]:
5530 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005531 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005532
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005533 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005534 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005535 return 1
5536 if len(branches) == 1:
5537 RunGit(['checkout', branches[0]])
5538 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005539 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005540 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005541 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005542 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005543 try:
5544 RunGit(['checkout', branches[int(which)]])
5545 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005546 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005547 return 1
5548
5549 return 0
5550
5551
maruel@chromium.org29404b52014-09-08 22:58:00 +00005552def CMDlol(parser, args):
5553 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005554 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005555 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5556 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5557 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005558 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005559 return 0
5560
5561
Josip Sokcevic0399e172022-03-21 23:11:51 +00005562def CMDversion(parser, args):
5563 import utils
5564 print(utils.depot_tools_version())
5565
5566
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005567class OptionParser(optparse.OptionParser):
5568 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005569
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005570 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005571 optparse.OptionParser.__init__(
5572 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005573 self.add_option(
5574 '-v', '--verbose', action='count', default=0,
5575 help='Use 2 times for more debugging info')
5576
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005577 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005578 try:
5579 return self._parse_args(args)
5580 finally:
5581 # Regardless of success or failure of args parsing, we want to report
5582 # metrics, but only after logging has been initialized (if parsing
5583 # succeeded).
5584 global settings
5585 settings = Settings()
5586
Edward Lesmes9c349062021-05-06 20:02:39 +00005587 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005588 # GetViewVCUrl ultimately calls logging method.
5589 project_url = settings.GetViewVCUrl().strip('/+')
5590 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5591 metrics.collector.add('project_urls', [project_url])
5592
5593 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005594 # Create an optparse.Values object that will store only the actual passed
5595 # options, without the defaults.
5596 actual_options = optparse.Values()
5597 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5598 # Create an optparse.Values object with the default options.
5599 options = optparse.Values(self.get_default_values().__dict__)
5600 # Update it with the options passed by the user.
5601 options._update_careful(actual_options.__dict__)
5602 # Store the options passed by the user in an _actual_options attribute.
5603 # We store only the keys, and not the values, since the values can contain
5604 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005605 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005606
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005607 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005608 logging.basicConfig(
5609 level=levels[min(options.verbose, len(levels) - 1)],
5610 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5611 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005612
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005613 return options, args
5614
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005615
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005616def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005617 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005618 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005619 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005620 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005621
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005622 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005623 dispatcher = subcommand.CommandDispatcher(__name__)
5624 try:
5625 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005626 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005627 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005628 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005629 if e.code != 500:
5630 raise
5631 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005632 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005633 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005634 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005635
5636
5637if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005638 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5639 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005640 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005641 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005642 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005643 sys.exit(main(sys.argv[1:]))