blob: eae031d5ac801d0fdc3a960e87211169e41614f9 [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'
Gavin Makbe2e9262022-11-08 23:41:55 +0000128# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
129# you make to Gerrit. Instead, it creates a new commit object that contains all
130# changes you've made, diffed against a parent/merge base.
131# This is the hash of the new squashed commit and you can find this on Gerrit.
132GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
133# This is the latest uploaded local commit hash.
134LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000135
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000136# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000137Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000138
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000139# Initialized in main()
140settings = None
141
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100142# Used by tests/git_cl_test.py to add extra logging.
143# Inside the weirdly failing test, add this:
144# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700145# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100146_IS_BEING_TESTED = False
147
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000148_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000149
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000150_KNOWN_GERRIT_TO_SHORT_URLS = {
151 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
152 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
153}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000154assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
155 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000156
157
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000158class GitPushError(Exception):
159 pass
160
161
Christopher Lamf732cd52017-01-24 12:40:11 +1100162def DieWithError(message, change_desc=None):
163 if change_desc:
164 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000165 print('\n ** Content of CL description **\n' +
166 '='*72 + '\n' +
167 change_desc.description + '\n' +
168 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100169
vapiera7fbd5a2016-06-16 09:17:49 -0700170 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000171 sys.exit(1)
172
173
Christopher Lamf732cd52017-01-24 12:40:11 +1100174def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000175 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000176 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000177 with open(backup_path, 'wb') as backup_file:
178 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100179
180
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000181def GetNoGitPagerEnv():
182 env = os.environ.copy()
183 # 'cat' is a magical git string that disables pagers on all platforms.
184 env['GIT_PAGER'] = 'cat'
185 return env
186
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000187
bsep@chromium.org627d9002016-04-29 00:00:52 +0000188def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000189 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000190 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
191 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000192 except subprocess2.CalledProcessError as e:
193 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000194 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000195 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
196 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000197 out = e.stdout.decode('utf-8', 'replace')
198 if e.stderr:
199 out += e.stderr.decode('utf-8', 'replace')
200 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000201
202
203def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000204 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000205 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000206
207
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000208def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000209 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700210 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000211 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700212 else:
213 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000214 try:
tandrii5d48c322016-08-18 16:19:37 -0700215 (out, _), code = subprocess2.communicate(['git'] + args,
216 env=GetNoGitPagerEnv(),
217 stdout=subprocess2.PIPE,
218 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000219 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700220 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900221 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000222 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000223
224
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000225def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000226 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000227 return RunGitWithCode(args, suppress_stderr=True)[1]
228
229
tandrii2a16b952016-10-19 07:09:44 -0700230def time_sleep(seconds):
231 # Use this so that it can be mocked in tests without interfering with python
232 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700233 return time.sleep(seconds)
234
235
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000236def time_time():
237 # Use this so that it can be mocked in tests without interfering with python
238 # system machinery.
239 return time.time()
240
241
Edward Lemur1b52d872019-05-09 21:12:12 +0000242def datetime_now():
243 # Use this so that it can be mocked in tests without interfering with python
244 # system machinery.
245 return datetime.datetime.now()
246
247
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100248def confirm_or_exit(prefix='', action='confirm'):
249 """Asks user to press enter to continue or press Ctrl+C to abort."""
250 if not prefix or prefix.endswith('\n'):
251 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100252 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100253 mid = ' Press'
254 elif prefix.endswith(' '):
255 mid = 'press'
256 else:
257 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000258 gclient_utils.AskForData(
259 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260
261
262def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000263 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000264 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265 while True:
266 if 'yes'.startswith(result):
267 return True
268 if 'no'.startswith(result):
269 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000270 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100271
272
machenbach@chromium.org45453142015-09-15 08:45:22 +0000273def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000274 prop_list = getattr(options, 'properties', [])
275 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000276 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000277 try:
278 properties[key] = json.loads(val)
279 except ValueError:
280 pass # If a value couldn't be evaluated, treat it as a string.
281 return properties
282
283
Edward Lemur4c707a22019-09-24 21:13:43 +0000284def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000285 """Calls a buildbucket v2 method and returns the parsed json response."""
286 headers = {
287 'Accept': 'application/json',
288 'Content-Type': 'application/json',
289 }
290 request = json.dumps(request)
291 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
292
293 logging.info('POST %s with %s' % (url, request))
294
295 attempts = 1
296 time_to_sleep = 1
297 while True:
298 response, content = http.request(url, 'POST', body=request, headers=headers)
299 if response.status == 200:
300 return json.loads(content[4:])
301 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
302 msg = '%s error when calling POST %s with %s: %s' % (
303 response.status, url, request, content)
304 raise BuildbucketResponseException(msg)
305 logging.debug(
306 '%s error when calling POST %s with %s. '
307 'Sleeping for %d seconds and retrying...' % (
308 response.status, url, request, time_to_sleep))
309 time.sleep(time_to_sleep)
310 time_to_sleep *= 2
311 attempts += 1
312
313 assert False, 'unreachable'
314
315
Edward Lemur6215c792019-10-03 21:59:05 +0000316def _parse_bucket(raw_bucket):
317 legacy = True
318 project = bucket = None
319 if '/' in raw_bucket:
320 legacy = False
321 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000322 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000323 elif raw_bucket.startswith('luci.'):
324 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000325 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000326 elif '.' in raw_bucket:
327 project = raw_bucket.split('.')[0]
328 bucket = raw_bucket
329 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000330 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000331 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
332 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000333
334
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000335def _canonical_git_googlesource_host(host):
336 """Normalizes Gerrit hosts (with '-review') to Git host."""
337 assert host.endswith(_GOOGLESOURCE)
338 # Prefix doesn't include '.' at the end.
339 prefix = host[:-(1 + len(_GOOGLESOURCE))]
340 if prefix.endswith('-review'):
341 prefix = prefix[:-len('-review')]
342 return prefix + '.' + _GOOGLESOURCE
343
344
345def _canonical_gerrit_googlesource_host(host):
346 git_host = _canonical_git_googlesource_host(host)
347 prefix = git_host.split('.', 1)[0]
348 return prefix + '-review.' + _GOOGLESOURCE
349
350
351def _get_counterpart_host(host):
352 assert host.endswith(_GOOGLESOURCE)
353 git = _canonical_git_googlesource_host(host)
354 gerrit = _canonical_gerrit_googlesource_host(git)
355 return git if gerrit == host else gerrit
356
357
Quinten Yearsley777660f2020-03-04 23:37:06 +0000358def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000359 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700360
361 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000362 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000363 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700364 options: Command-line options.
365 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000366 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000367 for project, bucket, builder in jobs:
368 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000369 print('To see results here, run: git cl try-results')
370 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700371
Quinten Yearsley777660f2020-03-04 23:37:06 +0000372 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000373 if not requests:
374 return
375
Edward Lemur5b929a42019-10-21 17:57:39 +0000376 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000377 http.force_exception_to_status_code = True
378
379 batch_request = {'requests': requests}
380 batch_response = _call_buildbucket(
381 http, options.buildbucket_host, 'Batch', batch_request)
382
383 errors = [
384 ' ' + response['error']['message']
385 for response in batch_response.get('responses', [])
386 if 'error' in response
387 ]
388 if errors:
389 raise BuildbucketResponseException(
390 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
391
392
Quinten Yearsley777660f2020-03-04 23:37:06 +0000393def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000394 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000395 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000396 shared_properties = {
397 'category': options.ensure_value('category', 'git_cl_try')
398 }
399 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000400 shared_properties['clobber'] = True
401 shared_properties.update(_get_properties_from_options(options) or {})
402
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000403 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000404 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000405 shared_tags.append({'key': 'retry_failed',
406 'value': '1'})
407
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000408 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000409 for (project, bucket, builder) in jobs:
410 properties = shared_properties.copy()
411 if 'presubmit' in builder.lower():
412 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000413
Edward Lemur45768512020-03-02 19:03:14 +0000414 requests.append({
415 'scheduleBuild': {
416 'requestId': str(uuid.uuid4()),
417 'builder': {
418 'project': getattr(options, 'project', None) or project,
419 'bucket': bucket,
420 'builder': builder,
421 },
422 'gerritChanges': gerrit_changes,
423 'properties': properties,
424 'tags': [
425 {'key': 'builder', 'value': builder},
426 ] + shared_tags,
427 }
428 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000429
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000430 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000431 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000432 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000433 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000434 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000435 'id': options.revision,
436 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000437 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000438
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000439 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000440
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000441
Quinten Yearsley777660f2020-03-04 23:37:06 +0000442def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000443 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000444
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000445 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000446 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000447 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000448 request = {
449 'predicate': {
450 'gerritChanges': [changelist.GetGerritChange(patchset)],
451 },
452 'fields': ','.join('builds.*.' + field for field in fields),
453 }
tandrii221ab252016-10-06 08:12:04 -0700454
Edward Lemur5b929a42019-10-21 17:57:39 +0000455 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000456 if authenticator.has_cached_credentials():
457 http = authenticator.authorize(httplib2.Http())
458 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700459 print('Warning: Some results might be missing because %s' %
460 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000461 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000462 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000463 http.force_exception_to_status_code = True
464
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000465 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
466 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000467
Edward Lemur45768512020-03-02 19:03:14 +0000468
Edward Lemur5b929a42019-10-21 17:57:39 +0000469def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000470 """Fetches builds from the latest patchset that has builds (within
471 the last few patchsets).
472
473 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000474 changelist (Changelist): The CL to fetch builds for
475 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000476 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
477 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000478 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000479 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
480 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000481 """
482 assert buildbucket_host
483 assert changelist.GetIssue(), 'CL must be uploaded first'
484 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000485 if latest_patchset is None:
486 assert changelist.GetMostRecentPatchset()
487 ps = changelist.GetMostRecentPatchset()
488 else:
489 assert latest_patchset > 0, latest_patchset
490 ps = latest_patchset
491
Quinten Yearsley983111f2019-09-26 17:18:48 +0000492 min_ps = max(1, ps - 5)
493 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000494 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000495 if len(builds):
496 return builds, ps
497 ps -= 1
498 return [], 0
499
500
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000501def _filter_failed_for_retry(all_builds):
502 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000503
504 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000505 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000506 i.e. a list of buildbucket.v2.Builds which includes status and builder
507 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000508
509 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000510 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000511 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512 """
Edward Lemur45768512020-03-02 19:03:14 +0000513 grouped = {}
514 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000515 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000516 key = (builder['project'], builder['bucket'], builder['builder'])
517 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000518
Edward Lemur45768512020-03-02 19:03:14 +0000519 jobs = []
520 for (project, bucket, builder), builds in grouped.items():
521 if 'triggered' in builder:
522 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
523 'from a parent. Please schedule a manual job for the parent '
524 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000525 continue
526 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
527 # Don't retry if any are running.
528 continue
Edward Lemur45768512020-03-02 19:03:14 +0000529 # If builder had several builds, retry only if the last one failed.
530 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
531 # build, but in case of retrying failed jobs retrying a flaky one makes
532 # sense.
533 builds = sorted(builds, key=lambda b: b['createTime'])
534 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
535 continue
536 # Don't retry experimental build previously triggered by CQ.
537 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
538 for t in builds[-1]['tags']):
539 continue
540 jobs.append((project, bucket, builder))
541
542 # Sort the jobs to make testing easier.
543 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000544
545
Quinten Yearsley777660f2020-03-04 23:37:06 +0000546def _print_tryjobs(options, builds):
547 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000548 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000549 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 return
551
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 longest_builder = max(len(b['builder']['builder']) for b in builds)
553 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000555 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
556 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000558 builds_by_status = {}
559 for b in builds:
560 builds_by_status.setdefault(b['status'], []).append({
561 'id': b['id'],
562 'name': name_fmt.format(
563 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
564 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000566 sort_key = lambda b: (b['name'], b['id'])
567
568 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 if not builds:
571 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000573 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000574 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576 else:
577 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
578
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000579 print(colorize(title))
580 for b in sorted(builds, key=sort_key):
581 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000582
583 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000584 print_builds(
585 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
586 print_builds(
587 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
588 color=Fore.MAGENTA)
589 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
590 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
591 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000592 print_builds('Started:', builds_by_status.pop('STARTED', []),
593 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 print_builds(
595 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 print_builds(
598 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000599 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600
601
Aiden Bennerc08566e2018-10-03 17:52:42 +0000602def _ComputeDiffLineRanges(files, upstream_commit):
603 """Gets the changed line ranges for each file since upstream_commit.
604
605 Parses a git diff on provided files and returns a dict that maps a file name
606 to an ordered list of range tuples in the form (start_line, count).
607 Ranges are in the same format as a git diff.
608 """
609 # If files is empty then diff_output will be a full diff.
610 if len(files) == 0:
611 return {}
612
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000613 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000614 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000615 diff_output = RunGit(diff_cmd)
616
617 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
618 # 2 capture groups
619 # 0 == fname of diff file
620 # 1 == 'diff_start,diff_count' or 'diff_start'
621 # will match each of
622 # diff --git a/foo.foo b/foo.py
623 # @@ -12,2 +14,3 @@
624 # @@ -12,2 +17 @@
625 # running re.findall on the above string with pattern will give
626 # [('foo.py', ''), ('', '14,3'), ('', '17')]
627
628 curr_file = None
629 line_diffs = {}
630 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
631 if match[0] != '':
632 # Will match the second filename in diff --git a/a.py b/b.py.
633 curr_file = match[0]
634 line_diffs[curr_file] = []
635 else:
636 # Matches +14,3
637 if ',' in match[1]:
638 diff_start, diff_count = match[1].split(',')
639 else:
640 # Single line changes are of the form +12 instead of +12,1.
641 diff_start = match[1]
642 diff_count = 1
643
644 diff_start = int(diff_start)
645 diff_count = int(diff_count)
646
647 # If diff_count == 0 this is a removal we can ignore.
648 line_diffs[curr_file].append((diff_start, diff_count))
649
650 return line_diffs
651
652
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000653def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000654 """Checks if a yapf file is in any parent directory of fpath until top_dir.
655
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000656 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000657 is found returns None. Uses yapf_config_cache as a cache for previously found
658 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000659 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000660 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000661 # Return result if we've already computed it.
662 if fpath in yapf_config_cache:
663 return yapf_config_cache[fpath]
664
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665 parent_dir = os.path.dirname(fpath)
666 if os.path.isfile(fpath):
667 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000668 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000669 # Otherwise fpath is a directory
670 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
671 if os.path.isfile(yapf_file):
672 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000673 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000674 # If we're at the top level directory, or if we're at root
675 # there is no provided style.
676 ret = None
677 else:
678 # Otherwise recurse on the current directory.
679 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 yapf_config_cache[fpath] = ret
681 return ret
682
683
Brian Sheedyb4307d52019-12-02 19:18:17 +0000684def _GetYapfIgnorePatterns(top_dir):
685 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000686
687 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
688 but this functionality appears to break when explicitly passing files to
689 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000690 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000691 the .yapfignore file should be in the directory that yapf is invoked from,
692 which we assume to be the top level directory in this case.
693
694 Args:
695 top_dir: The top level directory for the repository being formatted.
696
697 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000698 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000699 """
700 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000701 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000702 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000703 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000704
Anthony Politoc64e3902021-04-30 21:55:25 +0000705 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
706 stripped_line = line.strip()
707 # Comments and blank lines should be ignored.
708 if stripped_line.startswith('#') or stripped_line == '':
709 continue
710 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000711 return ignore_patterns
712
713
714def _FilterYapfIgnoredFiles(filepaths, patterns):
715 """Filters out any filepaths that match any of the given patterns.
716
717 Args:
718 filepaths: An iterable of strings containing filepaths to filter.
719 patterns: An iterable of strings containing fnmatch patterns to filter on.
720
721 Returns:
722 A list of strings containing all the elements of |filepaths| that did not
723 match any of the patterns in |patterns|.
724 """
725 # Not inlined so that tests can use the same implementation.
726 return [f for f in filepaths
727 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000728
729
Aaron Gable13101a62018-02-09 13:20:41 -0800730def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000731 """Prints statistics about the change to the user."""
732 # --no-ext-diff is broken in some versions of Git, so try to work around
733 # this by overriding the environment (but there is still a problem if the
734 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000735 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 if 'GIT_EXTERNAL_DIFF' in env:
737 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000738
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000739 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800740 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000741 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000742
743
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000744class BuildbucketResponseException(Exception):
745 pass
746
747
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000748class Settings(object):
749 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000750 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000751 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 self.tree_status_url = None
753 self.viewvc_url = None
754 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000755 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000756 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000757 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000758 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000759 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000760 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000761
Edward Lemur26964072020-02-19 19:18:51 +0000762 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000764 if self.updated:
765 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000766
Edward Lemur26964072020-02-19 19:18:51 +0000767 # The only value that actually changes the behavior is
768 # autoupdate = "false". Everything else means "true".
769 autoupdate = (
770 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
771
772 cr_settings_file = FindCodereviewSettingsFile()
773 if autoupdate != 'false' and cr_settings_file:
774 LoadCodereviewSettingsFromFile(cr_settings_file)
775 cr_settings_file.close()
776
777 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000779 @staticmethod
780 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000781 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000782
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000784 if self.root is None:
785 self.root = os.path.abspath(self.GetRelativeRoot())
786 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 def GetTreeStatusUrl(self, error_ok=False):
789 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000790 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
791 if self.tree_status_url is None and not error_ok:
792 DieWithError(
793 'You must configure your tree status URL by running '
794 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 return self.tree_status_url
796
797 def GetViewVCUrl(self):
798 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000799 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 return self.viewvc_url
801
rmistry@google.com90752582014-01-14 21:04:50 +0000802 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000803 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000804
rmistry@google.com5626a922015-02-26 14:03:30 +0000805 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000806 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000807 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000808 return run_post_upload_hook == "True"
809
Joanna Wangc8f23e22023-01-19 21:18:10 +0000810 def GetDefaultCCList(self):
811 return self._GetConfig('rietveld.cc')
812
Dirk Pranke6f0df682021-06-25 00:42:33 +0000813 def GetUsePython3(self):
814 return self._GetConfig('rietveld.use-python3')
815
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000816 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000817 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000818 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000819 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
820 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000821 # Default is squash now (http://crbug.com/611892#c23).
822 self.squash_gerrit_uploads = self._GetConfig(
823 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000824 return self.squash_gerrit_uploads
825
Edward Lesmes4de54132020-05-05 19:41:33 +0000826 def GetSquashGerritUploadsOverride(self):
827 """Return True or False if codereview.settings should be overridden.
828
829 Returns None if no override has been defined.
830 """
831 # See also http://crbug.com/611892#c23
832 result = self._GetConfig('gerrit.override-squash-uploads').lower()
833 if result == 'true':
834 return True
835 if result == 'false':
836 return False
837 return None
838
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000839 def GetIsGerrit(self):
840 """Return True if gerrit.host is set."""
841 if self.is_gerrit is None:
842 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
843 return self.is_gerrit
844
tandrii@chromium.org28253532016-04-14 13:46:56 +0000845 def GetGerritSkipEnsureAuthenticated(self):
846 """Return True if EnsureAuthenticated should not be done for Gerrit
847 uploads."""
848 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000849 self.gerrit_skip_ensure_authenticated = self._GetConfig(
850 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000851 return self.gerrit_skip_ensure_authenticated
852
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000853 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000854 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000855 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000856 # Git requires single quotes for paths with spaces. We need to replace
857 # them with double quotes for Windows to treat such paths as a single
858 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000859 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000860 return self.git_editor or None
861
thestig@chromium.org44202a22014-03-11 19:22:18 +0000862 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000863 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000864
865 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000866 return self._GetConfig(
867 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000868
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000869 def GetFormatFullByDefault(self):
870 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000871 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000872 result = (
873 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
874 error_ok=True).strip())
875 self.format_full_by_default = (result == 'true')
876 return self.format_full_by_default
877
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000878 def IsStatusCommitOrderByDate(self):
879 if self.is_status_commit_order_by_date is None:
880 result = (RunGit(['config', '--bool', 'cl.date-order'],
881 error_ok=True).strip())
882 self.is_status_commit_order_by_date = (result == 'true')
883 return self.is_status_commit_order_by_date
884
Edward Lemur26964072020-02-19 19:18:51 +0000885 def _GetConfig(self, key, default=''):
886 self._LazyUpdateIfNeeded()
887 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000888
889
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000890class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000891 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000892 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000893 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000894 DRY_RUN = 'dry_run'
895 COMMIT = 'commit'
896
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000897 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000898
899
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000900class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000901 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000902 self.issue = issue
903 self.patchset = patchset
904 self.hostname = hostname
905
906 @property
907 def valid(self):
908 return self.issue is not None
909
910
Edward Lemurf38bc172019-09-03 21:02:13 +0000911def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000912 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
913 fail_result = _ParsedIssueNumberArgument()
914
Edward Lemur678a6842019-10-03 22:25:05 +0000915 if isinstance(arg, int):
916 return _ParsedIssueNumberArgument(issue=arg)
917 if not isinstance(arg, basestring):
918 return fail_result
919
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000921 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700922
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000923 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000924 if not url.startswith('http'):
925 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000926 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
927 if url.startswith(short_url):
928 url = gerrit_url + url[len(short_url):]
929 break
930
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000932 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000933 except ValueError:
934 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200935
Alex Turner30ae6372022-01-04 02:32:52 +0000936 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
937 # URL.
938 if not arg.startswith('http') and '.' not in parsed_url.netloc:
939 return fail_result
940
Edward Lemur678a6842019-10-03 22:25:05 +0000941 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
942 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
943 # Short urls like https://domain/<issue_number> can be used, but don't allow
944 # specifying the patchset (you'd 404), but we allow that here.
945 if parsed_url.path == '/':
946 part = parsed_url.fragment
947 else:
948 part = parsed_url.path
949
950 match = re.match(
951 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
952 if not match:
953 return fail_result
954
955 issue = int(match.group('issue'))
956 patchset = match.group('patchset')
957 return _ParsedIssueNumberArgument(
958 issue=issue,
959 patchset=int(patchset) if patchset else None,
960 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000961
962
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000963def _create_description_from_log(args):
964 """Pulls out the commit log to use as a base for the CL description."""
965 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000966 if len(args) == 1 and args[0] == None:
967 # Handle the case where None is passed as the branch.
968 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000969 if len(args) == 1 and not args[0].endswith('.'):
970 log_args = [args[0] + '..']
971 elif len(args) == 1 and args[0].endswith('...'):
972 log_args = [args[0][:-1]]
973 elif len(args) == 2:
974 log_args = [args[0] + '..' + args[1]]
975 else:
976 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000977 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000978
979
Aaron Gablea45ee112016-11-22 15:14:38 -0800980class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700981 def __init__(self, issue, url):
982 self.issue = issue
983 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800984 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700985
986 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800987 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700988 self.issue, self.url)
989
990
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100991_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000992 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100993 # TODO(tandrii): these two aren't known in Gerrit.
994 'approval', 'disapproval'])
995
996
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000997class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000998 """Changelist works with one changelist in local branch.
999
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001000 Notes:
1001 * Not safe for concurrent multi-{thread,process} use.
1002 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001003 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001004 """
1005
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001006 def __init__(self,
1007 branchref=None,
1008 issue=None,
1009 codereview_host=None,
1010 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 """Create a new ChangeList instance.
1012
Edward Lemurf38bc172019-09-03 21:02:13 +00001013 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001014 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001015 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001016 global settings
1017 if not settings:
1018 # Happens when git_cl.py is used as a utility library.
1019 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001020
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001021 self.branchref = branchref
1022 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001023 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001024 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 else:
1026 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001027 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001029 self.lookedup_issue = False
1030 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001032 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001034 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001035 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001036 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001037 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001038
Edward Lemur125d60a2019-09-13 18:25:41 +00001039 # Lazily cached values.
1040 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1041 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001042 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001043 # Map from change number (issue) to its detail cache.
1044 self._detail_cache = {}
1045
1046 if codereview_host is not None:
1047 assert not codereview_host.startswith('https://'), codereview_host
1048 self._gerrit_host = codereview_host
1049 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001050
Edward Lesmese1576912021-02-16 21:53:34 +00001051 @property
1052 def owners_client(self):
1053 if self._owners_client is None:
1054 remote, remote_branch = self.GetRemoteBranch()
1055 branch = GetTargetRef(remote, remote_branch, None)
1056 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001057 host=self.GetGerritHost(),
1058 project=self.GetGerritProject(),
1059 branch=branch)
1060 return self._owners_client
1061
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001062 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001063 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001065 The return value is a string suitable for passing to git cl with the --cc
1066 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001067 """
1068 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001069 base_cc = settings.GetDefaultCCList()
1070 more_cc = ','.join(self.more_cc)
1071 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001072 return self.cc
1073
Daniel Cheng7227d212017-11-17 08:12:37 -08001074 def ExtendCC(self, more_cc):
1075 """Extends the list of users to cc on this CL based on the changed files."""
1076 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001077
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001078 def GetCommitDate(self):
1079 """Returns the commit date as provided in the constructor"""
1080 return self.commit_date
1081
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001082 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001083 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001084 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001085 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001086 if not branchref:
1087 return None
1088 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001089 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 return self.branch
1091
1092 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001093 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001094 self.GetBranch() # Poke the lazy loader.
1095 return self.branchref
1096
Edward Lemur85153282020-02-14 22:06:29 +00001097 def _GitGetBranchConfigValue(self, key, default=None):
1098 return scm.GIT.GetBranchConfig(
1099 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001100
Edward Lemur85153282020-02-14 22:06:29 +00001101 def _GitSetBranchConfigValue(self, key, value):
1102 action = 'set %s to %r' % (key, value)
1103 if not value:
1104 action = 'unset %s' % key
1105 assert self.GetBranch(), 'a branch is needed to ' + action
1106 return scm.GIT.SetBranchConfig(
1107 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001108
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001109 @staticmethod
1110 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001111 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001112 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001114 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1115 settings.GetRoot(), branch)
1116 if not remote or not upstream_branch:
1117 DieWithError(
1118 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001119 'Verify this branch is set up to track another \n'
1120 '(via the --track argument to "git checkout -b ..."). \n'
1121 'or pass complete "git diff"-style arguments if supported, like\n'
1122 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123
1124 return remote, upstream_branch
1125
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001126 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001127 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001128 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001129 DieWithError('The upstream for the current branch (%s) does not exist '
1130 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001131 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001132 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001133
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 def GetUpstreamBranch(self):
1135 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001136 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001137 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001138 upstream_branch = upstream_branch.replace('refs/heads/',
1139 'refs/remotes/%s/' % remote)
1140 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1141 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 self.upstream_branch = upstream_branch
1143 return self.upstream_branch
1144
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001145 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001146 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001147 remote, branch = None, self.GetBranch()
1148 seen_branches = set()
1149 while branch not in seen_branches:
1150 seen_branches.add(branch)
1151 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001152 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001153 if remote != '.' or branch.startswith('refs/remotes'):
1154 break
1155 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001156 remotes = RunGit(['remote'], error_ok=True).split()
1157 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001158 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001160 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001161 logging.warning('Could not determine which remote this change is '
1162 'associated with, so defaulting to "%s".' %
1163 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001164 else:
Gavin Make6a62332020-12-04 21:57:10 +00001165 logging.warning('Could not determine which remote this change is '
1166 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 branch = 'HEAD'
1168 if branch.startswith('refs/remotes'):
1169 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001170 elif branch.startswith('refs/branch-heads/'):
1171 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 else:
1173 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001174 return self._remote
1175
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001176 def GetRemoteUrl(self):
1177 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1178
1179 Returns None if there is no remote.
1180 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001181 is_cached, value = self._cached_remote_url
1182 if is_cached:
1183 return value
1184
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001186 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001187
Edward Lemur298f2cf2019-02-22 21:40:39 +00001188 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001189 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001190 if host:
1191 self._cached_remote_url = (True, url)
1192 return url
1193
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001194 # If it cannot be parsed as an url, assume it is a local directory,
1195 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001196 logging.warning('"%s" doesn\'t appear to point to a git host. '
1197 'Interpreting it as a local directory.', url)
1198 if not os.path.isdir(url):
1199 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001200 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1201 'but it doesn\'t exist.',
1202 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001203 return None
1204
1205 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001206 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001207
Edward Lemur79d4f992019-11-11 23:49:02 +00001208 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 if not host:
1210 logging.error(
1211 'Remote "%(remote)s" for branch "%(branch)s" points to '
1212 '"%(cache_path)s", but it is misconfigured.\n'
1213 '"%(cache_path)s" must be a git repo and must have a remote named '
1214 '"%(remote)s" pointing to the git host.', {
1215 'remote': remote,
1216 'cache_path': cache_path,
1217 'branch': self.GetBranch()})
1218 return None
1219
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001220 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001221 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001223 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001224 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001225 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001226 if self.GetBranch():
1227 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001228 if self.issue is not None:
1229 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001230 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 return self.issue
1232
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001233 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001235 issue = self.GetIssue()
1236 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001237 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001238 server = self.GetCodereviewServer()
1239 if short:
1240 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1241 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242
Dirk Pranke6f0df682021-06-25 00:42:33 +00001243 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001244 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001245
Edward Lemur6c6827c2020-02-06 21:15:18 +00001246 def FetchDescription(self, pretty=False):
1247 assert self.GetIssue(), 'issue is required to query Gerrit'
1248
Edward Lemur9aa1a962020-02-25 00:58:38 +00001249 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001250 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1251 current_rev = data['current_revision']
1252 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001253
1254 if not pretty:
1255 return self.description
1256
1257 # Set width to 72 columns + 2 space indent.
1258 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1259 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1260 lines = self.description.splitlines()
1261 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262
1263 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001264 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001265 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001266 if self.GetBranch():
1267 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001268 if self.patchset is not None:
1269 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001270 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271 return self.patchset
1272
Edward Lemur9aa1a962020-02-25 00:58:38 +00001273 def GetAuthor(self):
1274 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1275
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001276 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001277 """Set this branch's patchset. If patchset=0, clears the patchset."""
1278 assert self.GetBranch()
1279 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001280 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001281 else:
1282 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001283 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001285 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001286 """Set this branch's issue. If issue isn't given, clears the issue."""
1287 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001289 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001290 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001292 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001293 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001294 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001295 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 else:
tandrii5d48c322016-08-18 16:19:37 -07001297 # Reset all of these just to be clean.
1298 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001299 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001300 ISSUE_CONFIG_KEY,
1301 PATCHSET_CONFIG_KEY,
1302 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001303 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001304 ]
tandrii5d48c322016-08-18 16:19:37 -07001305 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001306 try:
1307 self._GitSetBranchConfigValue(prop, None)
1308 except subprocess2.CalledProcessError:
1309 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001310 msg = RunGit(['log', '-1', '--format=%B']).strip()
1311 if msg and git_footers.get_footer_change_id(msg):
1312 print('WARNING: The change patched into this branch has a Change-Id. '
1313 'Removing it.')
1314 RunGit(['commit', '--amend', '-m',
1315 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001316 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001317 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001318 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001319
Edward Lemur2c62b332020-03-12 22:12:33 +00001320 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001321 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001322 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001323 except subprocess2.CalledProcessError:
1324 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001325 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001326 'This branch probably doesn\'t exist anymore. To reset the\n'
1327 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001328 ' git branch --set-upstream-to origin/main %s\n'
1329 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001330 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001331
dsansomee2d6fd92016-09-08 00:10:47 -07001332 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001333 assert self.GetIssue(), 'issue is required to update description'
1334
1335 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001336 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001337 if not force:
1338 confirm_or_exit(
1339 'The description cannot be modified while the issue has a pending '
1340 'unpublished edit. Either publish the edit in the Gerrit web UI '
1341 'or delete it.\n\n', action='delete the unpublished edit')
1342
1343 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001344 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001345 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001346 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001347 description, notify='NONE')
1348
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001349 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001350
Edward Lemur75526302020-02-27 22:31:05 +00001351 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001352 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001353 '--root', settings.GetRoot(),
1354 '--upstream', upstream,
1355 ]
1356
1357 args.extend(['--verbose'] * verbose)
1358
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001359 remote, remote_branch = self.GetRemoteBranch()
1360 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001361 if settings.GetIsGerrit():
1362 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1363 args.extend(['--gerrit_project', self.GetGerritProject()])
1364 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001365
Edward Lemur99df04e2020-03-05 19:39:43 +00001366 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001367 issue = self.GetIssue()
1368 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001369 if author:
1370 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001371 if issue:
1372 args.extend(['--issue', str(issue)])
1373 if patchset:
1374 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001375
Edward Lemur75526302020-02-27 22:31:05 +00001376 return args
1377
Josip Sokcevic017544d2022-03-31 23:47:53 +00001378 def RunHook(self,
1379 committing,
1380 may_prompt,
1381 verbose,
1382 parallel,
1383 upstream,
1384 description,
1385 all_files,
1386 files=None,
1387 resultdb=False,
1388 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001389 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1390 args = self._GetCommonPresubmitArgs(verbose, upstream)
1391 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001392 if may_prompt:
1393 args.append('--may_prompt')
1394 if parallel:
1395 args.append('--parallel')
1396 if all_files:
1397 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001398 if files:
1399 args.extend(files.split(';'))
1400 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001401 if files or all_files:
1402 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001403
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001404 if resultdb and not realm:
1405 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1406 # it is not required to pass the realm flag
1407 print('Note: ResultDB reporting will NOT be performed because --realm'
1408 ' was not specified. To enable ResultDB, please run the command'
1409 ' again with the --realm argument to specify the LUCI realm.')
1410
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001411 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1412 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001413 if py3_results.get('skipped_presubmits', 1) == 0:
1414 print('No more presubmits to run - skipping Python 2 presubmits.')
1415 return py3_results
1416
1417 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1418 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001419 return self._MergePresubmitResults(py2_results, py3_results)
1420
1421 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1422 args = args[:]
1423 vpython = 'vpython3' if use_python3 else 'vpython'
1424
Edward Lemur227d5102020-02-25 23:45:35 +00001425 with gclient_utils.temporary_file() as description_file:
1426 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001427 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001428 args.extend(['--json_output', json_output])
1429 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001430 if self.GetUsePython3():
1431 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001432 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001433 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001434 if resultdb and realm:
1435 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001436
1437 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001438 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001439
Edward Lemur227d5102020-02-25 23:45:35 +00001440 metrics.collector.add_repeated('sub_commands', {
1441 'command': 'presubmit',
1442 'execution_time': time_time() - start,
1443 'exit_code': exit_code,
1444 })
1445
1446 if exit_code:
1447 sys.exit(exit_code)
1448
1449 json_results = gclient_utils.FileRead(json_output)
1450 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001451
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001452 def _MergePresubmitResults(self, py2_results, py3_results):
1453 return {
1454 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1455 py3_results.get('more_cc', []))),
1456 'errors': (
1457 py2_results.get('errors', []) + py3_results.get('errors', [])),
1458 'notifications': (
1459 py2_results.get('notifications', []) +
1460 py3_results.get('notifications', [])),
1461 'warnings': (
1462 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1463 }
1464
Brian Sheedy7326ca22022-11-02 18:36:17 +00001465 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001466 args = self._GetCommonPresubmitArgs(verbose, upstream)
1467 args.append('--post_upload')
1468
1469 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001470 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001471 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001472 if not py3_only:
1473 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001474 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1475 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001476 if not py3_only:
1477 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001478 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001479
Edward Lemur5a644f82020-03-18 16:44:57 +00001480 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1481 # Get description message for upload.
1482 if self.GetIssue():
1483 description = self.FetchDescription()
1484 elif options.message:
1485 description = options.message
1486 else:
1487 description = _create_description_from_log(git_diff_args)
1488 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001489 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001490
Edward Lemur5a644f82020-03-18 16:44:57 +00001491 bug = options.bug
1492 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001493 if not self.GetIssue():
1494 # Extract bug number from branch name, but only if issue is being created.
1495 # It must start with bug or fix, followed by _ or - and number.
1496 # Optionally, it may contain _ or - after number with arbitrary text.
1497 # Examples:
1498 # bug-123
1499 # bug_123
1500 # fix-123
1501 # fix-123-some-description
1502 match = re.match(
1503 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1504 self.GetBranch())
1505 if not bug and not fixed and match:
1506 if match.group('type') == 'bug':
1507 bug = match.group('bugnum')
1508 else:
1509 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001510
1511 change_description = ChangeDescription(description, bug, fixed)
1512
Joanna Wang39811b12023-01-20 23:09:48 +00001513 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001514 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001515 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001516 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001517 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001518 missing_files = [
1519 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001520 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001521 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001522 owners = self.owners_client.SuggestOwners(
1523 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001524 assert isinstance(options.reviewers, list), options.reviewers
1525 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001526
Edward Lemur5a644f82020-03-18 16:44:57 +00001527 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001528 if options.reviewers:
1529 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001530
1531 return change_description
1532
1533 def _GetTitleForUpload(self, options):
manukh566e9d02022-06-30 19:49:53 +00001534 # When not squashing or options.title is provided, just return
1535 # options.title.
1536 if not options.squash or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001537 return options.title
1538
1539 # On first upload, patchset title is always this string, while options.title
1540 # gets converted to first line of message.
1541 if not self.GetIssue():
1542 return 'Initial upload'
1543
1544 # When uploading subsequent patchsets, options.message is taken as the title
1545 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001546 if options.message:
1547 return options.message.strip()
1548
1549 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001550 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001551 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001552 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001553 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001554
1555 # Use the default title if the user confirms the default with a 'y'.
1556 if user_title.lower() == 'y':
1557 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001558 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001559
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001560 def CMDUpload(self, options, git_diff_args, orig_args):
1561 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001562 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001564 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001565 else:
1566 if self.GetBranch() is None:
1567 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1568
1569 # Default to diffing against common ancestor of upstream branch
1570 base_branch = self.GetCommonAncestorWithUpstream()
1571 git_diff_args = [base_branch, 'HEAD']
1572
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001573 # Fast best-effort checks to abort before running potentially expensive
1574 # hooks if uploading is likely to fail anyway. Passing these checks does
1575 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001576 self.EnsureAuthenticated(force=options.force)
1577 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001578
1579 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001580 watchlist = watchlists.Watchlists(settings.GetRoot())
1581 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001582 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001583 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
Edward Lemur5a644f82020-03-18 16:44:57 +00001585 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001587 hook_results = self.RunHook(
1588 committing=False,
1589 may_prompt=not options.force,
1590 verbose=options.verbose,
1591 parallel=options.parallel,
1592 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001593 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001594 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001595 resultdb=options.resultdb,
1596 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001597 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598
Aaron Gable13101a62018-02-09 13:20:41 -08001599 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001600 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001601 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001603 self._GitSetBranchConfigValue(
Gavin Makbe2e9262022-11-08 23:41:55 +00001604 LAST_UPLOAD_HASH_CONFIG_KEY,
1605 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606 # Run post upload hooks, if specified.
1607 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001608 self.RunPostUploadHook(options.verbose, base_branch,
1609 change_desc.description,
1610 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001611
1612 # Upload all dependencies if specified.
1613 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001614 print()
1615 print('--dependencies has been specified.')
1616 print('All dependent local branches will be re-uploaded.')
1617 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001618 # Remove the dependencies flag from args so that we do not end up in a
1619 # loop.
1620 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001621 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 return ret
1623
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001624 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001625 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001626
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001627 Issue must have been already uploaded and known. Optionally allows for
1628 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001629 """
1630 assert new_state in _CQState.ALL_STATES
1631 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001632 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001633 vote_map = {
1634 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001635 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001636 _CQState.DRY_RUN: 1,
1637 _CQState.COMMIT: 2,
1638 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001639 if new_state == _CQState.QUICK_RUN:
1640 labels = {
1641 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1642 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1643 }
1644 else:
1645 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001646 notify = False if new_state == _CQState.DRY_RUN else None
1647 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001648 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001649 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001650 return 0
1651 except KeyboardInterrupt:
1652 raise
1653 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001654 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001655 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001656 ' * Your project has no CQ,\n'
1657 ' * You don\'t have permission to change the CQ state,\n'
1658 ' * There\'s a bug in this code (see stack trace below).\n'
1659 'Consider specifying which bots to trigger manually or asking your '
1660 'project owners for permissions or contacting Chrome Infra at:\n'
1661 'https://www.chromium.org/infra\n\n' %
1662 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001663 # Still raise exception so that stack trace is printed.
1664 raise
1665
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001666 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001667 # Lazy load of configs.
1668 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001669 if self._gerrit_host and '.' not in self._gerrit_host:
1670 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1671 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001672 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001673 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001674 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001675 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001676 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1677 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001678 return self._gerrit_host
1679
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001680 def _GetGitHost(self):
1681 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001682 remote_url = self.GetRemoteUrl()
1683 if not remote_url:
1684 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001685 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001686
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001687 def GetCodereviewServer(self):
1688 if not self._gerrit_server:
1689 # If we're on a branch then get the server potentially associated
1690 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001691 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001692 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001693 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001694 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001695 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001696 if not self._gerrit_server:
1697 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1698 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001699 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001700 parts[0] = parts[0] + '-review'
1701 self._gerrit_host = '.'.join(parts)
1702 self._gerrit_server = 'https://%s' % self._gerrit_host
1703 return self._gerrit_server
1704
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001705 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001706 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001707 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001708 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001709 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001710 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001711 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001712 if project.endswith('.git'):
1713 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001714 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1715 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1716 # gitiles/git-over-https protocol. E.g.,
1717 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1718 # as
1719 # https://chromium.googlesource.com/v8/v8
1720 if project.startswith('a/'):
1721 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001722 return project
1723
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001724 def _GerritChangeIdentifier(self):
1725 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1726
1727 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001728 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001729 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001730 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001731 if project:
1732 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1733 # Fall back on still unique, but less efficient change number.
1734 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001735
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001736 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001737 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001738 if settings.GetGerritSkipEnsureAuthenticated():
1739 # For projects with unusual authentication schemes.
1740 # See http://crbug.com/603378.
1741 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001742
1743 # Check presence of cookies only if using cookies-based auth method.
1744 cookie_auth = gerrit_util.Authenticator.get()
1745 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001746 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001747
Florian Mayerae510e82020-01-30 21:04:48 +00001748 remote_url = self.GetRemoteUrl()
1749 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001750 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001751 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001752 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1753 logging.warning(
1754 'Ignoring branch %(branch)s with non-https/sso remote '
1755 '%(remote)s', {
1756 'branch': self.branch,
1757 'remote': self.GetRemoteUrl()
1758 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001759 return
1760
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001761 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001762 self.GetCodereviewServer()
1763 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001764 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001765
1766 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1767 git_auth = cookie_auth.get_auth_header(git_host)
1768 if gerrit_auth and git_auth:
1769 if gerrit_auth == git_auth:
1770 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001771 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001772 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001773 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001774 ' %s\n'
1775 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001776 ' Consider running the following command:\n'
1777 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001778 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001779 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001780 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001781 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001782 cookie_auth.get_new_password_message(git_host)))
1783 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001784 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001785 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001786
1787 missing = (
1788 ([] if gerrit_auth else [self._gerrit_host]) +
1789 ([] if git_auth else [git_host]))
1790 DieWithError('Credentials for the following hosts are required:\n'
1791 ' %s\n'
1792 'These are read from %s (or legacy %s)\n'
1793 '%s' % (
1794 '\n '.join(missing),
1795 cookie_auth.get_gitcookies_path(),
1796 cookie_auth.get_netrc_path(),
1797 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001798
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001799 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001800 if not self.GetIssue():
1801 return
1802
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001803 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001804 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001805 DieWithError(
1806 'Change %s has been abandoned, new uploads are not allowed' %
1807 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001808 if status == 'MERGED':
1809 answer = gclient_utils.AskForData(
1810 'Change %s has been submitted, new uploads are not allowed. '
1811 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1812 ).lower()
1813 if answer not in ('y', ''):
1814 DieWithError('New uploads are not allowed.')
1815 self.SetIssue()
1816 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001817
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001818 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1819 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1820 # Apparently this check is not very important? Otherwise get_auth_email
1821 # could have been added to other implementations of Authenticator.
1822 cookies_auth = gerrit_util.Authenticator.get()
1823 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001824 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001825
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001826 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001827 if self.GetIssueOwner() == cookies_user:
1828 return
1829 logging.debug('change %s owner is %s, cookies user is %s',
1830 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001831 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001832 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001833 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001834 if details['email'] == self.GetIssueOwner():
1835 return
1836 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001837 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001838 'as %s.\n'
1839 'Uploading may fail due to lack of permissions.' %
1840 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1841 confirm_or_exit(action='upload')
1842
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001843 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001844 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001845 or CQ status, assuming adherence to a common workflow.
1846
1847 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001848 * 'error' - error from review tool (including deleted issues)
1849 * 'unsent' - no reviewers added
1850 * 'waiting' - waiting for review
1851 * 'reply' - waiting for uploader to reply to review
1852 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001853 * 'dry-run' - dry-running in the CQ
1854 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001855 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001856 """
1857 if not self.GetIssue():
1858 return None
1859
1860 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001861 data = self._GetChangeDetail([
1862 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001863 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864 return 'error'
1865
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001866 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001867 return 'closed'
1868
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001869 cq_label = data['labels'].get('Commit-Queue', {})
1870 max_cq_vote = 0
1871 for vote in cq_label.get('all', []):
1872 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1873 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001874 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001875 if max_cq_vote == 1:
1876 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001877
Aaron Gable9ab38c62017-04-06 14:36:33 -07001878 if data['labels'].get('Code-Review', {}).get('approved'):
1879 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001880
1881 if not data.get('reviewers', {}).get('REVIEWER', []):
1882 return 'unsent'
1883
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001884 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001885 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001886 while messages:
1887 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001888 if (m.get('tag', '').startswith('autogenerated:cq') or
1889 m.get('tag', '').startswith('autogenerated:cv')):
1890 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001891 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001892 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001893 # Most recent message was by owner.
1894 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001895
1896 # Some reply from non-owner.
1897 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001898
1899 # Somehow there are no messages even though there are reviewers.
1900 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001901
Gavin Mak4e5e3992022-11-14 22:40:12 +00001902 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001903 if not self.GetIssue():
1904 return None
1905
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001906 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001907 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00001908 if update:
1909 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08001910 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
Gavin Makf35a9eb2022-11-17 18:34:36 +00001912 def _IsPatchsetRangeSignificant(self, lower, upper):
1913 """Returns True if the inclusive range of patchsets contains any reworks or
1914 rebases."""
1915 if not self.GetIssue():
1916 return False
1917
1918 data = self._GetChangeDetail(['ALL_REVISIONS'])
1919 ps_kind = {}
1920 for rev_info in data.get('revisions', {}).values():
1921 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
1922
1923 for ps in range(lower, upper + 1):
1924 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
1925 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
1926 return True
1927 return False
1928
Gavin Make61ccc52020-11-13 00:12:57 +00001929 def GetMostRecentDryRunPatchset(self):
1930 """Get patchsets equivalent to the most recent patchset and return
1931 the patchset with the latest dry run. If none have been dry run, return
1932 the latest patchset."""
1933 if not self.GetIssue():
1934 return None
1935
1936 data = self._GetChangeDetail(['ALL_REVISIONS'])
1937 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001938 dry_run = {int(m['_revision_number'])
1939 for m in data.get('messages', [])
1940 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001941
1942 for revision_info in sorted(data.get('revisions', {}).values(),
1943 key=lambda c: c['_number'], reverse=True):
1944 if revision_info['_number'] in dry_run:
1945 patchset = revision_info['_number']
1946 break
1947 if revision_info.get('kind', '') not in \
1948 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1949 break
1950 self.SetPatchset(patchset)
1951 return patchset
1952
Aaron Gable636b13f2017-07-14 10:42:48 -07001953 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001954 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001955 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001956 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001957
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001958 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001959 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001960 # CURRENT_REVISION is included to get the latest patchset so that
1961 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001962 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001963 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1964 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001965 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001966 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001967 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001968 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001969
1970 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001971 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001972 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001973 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001974 line_comments = file_comments.setdefault(path, [])
1975 line_comments.extend(
1976 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001977
1978 # Build dictionary of file comments for easy access and sorting later.
1979 # {author+date: {path: {patchset: {line: url+message}}}}
1980 comments = collections.defaultdict(
1981 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001982
1983 server = self.GetCodereviewServer()
1984 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1985 # /c/ is automatically added by short URL server.
1986 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1987 self.GetIssue())
1988 else:
1989 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1990
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001991 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001992 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001993 tag = comment.get('tag', '')
1994 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001995 continue
1996 key = (comment['author']['email'], comment['updated'])
1997 if comment.get('side', 'REVISION') == 'PARENT':
1998 patchset = 'Base'
1999 else:
2000 patchset = 'PS%d' % comment['patch_set']
2001 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002002 url = ('%s/%s/%s#%s%s' %
2003 (url_prefix, comment['patch_set'], path,
2004 'b' if comment.get('side') == 'PARENT' else '',
2005 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002006 comments[key][path][patchset][line] = (url, comment['message'])
2007
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002008 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002009 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002010 summary = self._BuildCommentSummary(msg, comments, readable)
2011 if summary:
2012 summaries.append(summary)
2013 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002014
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002015 @staticmethod
2016 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002017 if 'email' not in msg['author']:
2018 # Some bot accounts may not have an email associated.
2019 return None
2020
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002021 key = (msg['author']['email'], msg['date'])
2022 # Don't bother showing autogenerated messages that don't have associated
2023 # file or line comments. this will filter out most autogenerated
2024 # messages, but will keep robot comments like those from Tricium.
2025 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2026 if is_autogenerated and not comments.get(key):
2027 return None
2028 message = msg['message']
2029 # Gerrit spits out nanoseconds.
2030 assert len(msg['date'].split('.')[-1]) == 9
2031 date = datetime.datetime.strptime(msg['date'][:-3],
2032 '%Y-%m-%d %H:%M:%S.%f')
2033 if key in comments:
2034 message += '\n'
2035 for path, patchsets in sorted(comments.get(key, {}).items()):
2036 if readable:
2037 message += '\n%s' % path
2038 for patchset, lines in sorted(patchsets.items()):
2039 for line, (url, content) in sorted(lines.items()):
2040 if line:
2041 line_str = 'Line %d' % line
2042 path_str = '%s:%d:' % (path, line)
2043 else:
2044 line_str = 'File comment'
2045 path_str = '%s:0:' % path
2046 if readable:
2047 message += '\n %s, %s: %s' % (patchset, line_str, url)
2048 message += '\n %s\n' % content
2049 else:
2050 message += '\n%s ' % path_str
2051 message += '\n%s\n' % content
2052
2053 return _CommentSummary(
2054 date=date,
2055 message=message,
2056 sender=msg['author']['email'],
2057 autogenerated=is_autogenerated,
2058 # These could be inferred from the text messages and correlated with
2059 # Code-Review label maximum, however this is not reliable.
2060 # Leaving as is until the need arises.
2061 approval=False,
2062 disapproval=False,
2063 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002064
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002065 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002066 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002067 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002068
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002069 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002070 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002071 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002072
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002073 def _GetChangeDetail(self, options=None):
2074 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002075 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002076 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002077
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002078 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002079 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002080 options.append('CURRENT_COMMIT')
2081
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002082 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002083 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002084 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002085
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002086 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2087 # Assumption: data fetched before with extra options is suitable
2088 # for return for a smaller set of options.
2089 # For example, if we cached data for
2090 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2091 # and request is for options=[CURRENT_REVISION],
2092 # THEN we can return prior cached data.
2093 if options_set.issubset(cached_options_set):
2094 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002095
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002096 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002097 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002098 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002099 except gerrit_util.GerritError as e:
2100 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002101 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002102 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002103
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002104 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002105 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002106
Gavin Mak4e5e3992022-11-14 22:40:12 +00002107 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002108 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002109 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002110 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2111 self._GerritChangeIdentifier(),
2112 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002113 except gerrit_util.GerritError as e:
2114 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002115 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002116 raise
agable32978d92016-11-01 12:55:02 -07002117 return data
2118
Karen Qian40c19422019-03-13 21:28:29 +00002119 def _IsCqConfigured(self):
2120 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002121 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002122
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002123 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002124 if git_common.is_dirty_git_tree('land'):
2125 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002126
tandriid60367b2016-06-22 05:25:12 -07002127 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002128 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002129 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002130 'which can test and land changes for you. '
2131 'Are you sure you wish to bypass it?\n',
2132 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002133 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002134 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002135 # Note: git diff outputs nothing if there is no diff.
2136 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002137 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002138 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002139 if detail['current_revision'] == last_upload:
2140 differs = False
2141 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002142 print('WARNING: Local branch contents differ from latest uploaded '
2143 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002144 if differs:
2145 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002146 confirm_or_exit(
2147 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2148 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002149 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002150 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002151 upstream = self.GetCommonAncestorWithUpstream()
2152 if self.GetIssue():
2153 description = self.FetchDescription()
2154 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002155 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002156 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002157 committing=True,
2158 may_prompt=not force,
2159 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002160 parallel=parallel,
2161 upstream=upstream,
2162 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002163 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002164 resultdb=resultdb,
2165 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002166
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002167 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002168 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002169 links = self._GetChangeCommit().get('web_links', [])
2170 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002171 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002172 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002173 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002174 return 0
2175
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002176 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2177 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 assert parsed_issue_arg.valid
2179
Edward Lemur125d60a2019-09-13 18:25:41 +00002180 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002181
2182 if parsed_issue_arg.hostname:
2183 self._gerrit_host = parsed_issue_arg.hostname
2184 self._gerrit_server = 'https://%s' % self._gerrit_host
2185
tandriic2405f52016-10-10 08:13:15 -07002186 try:
2187 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002188 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002189 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190
2191 if not parsed_issue_arg.patchset:
2192 # Use current revision by default.
2193 revision_info = detail['revisions'][detail['current_revision']]
2194 patchset = int(revision_info['_number'])
2195 else:
2196 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002197 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002198 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2199 break
2200 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002201 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 (parsed_issue_arg.patchset, self.GetIssue()))
2203
Edward Lemur125d60a2019-09-13 18:25:41 +00002204 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002205 if remote_url.endswith('.git'):
2206 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002207 remote_url = remote_url.rstrip('/')
2208
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002210 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002211
2212 if remote_url != fetch_info['url']:
2213 DieWithError('Trying to patch a change from %s but this repo appears '
2214 'to be %s.' % (fetch_info['url'], remote_url))
2215
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002216 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002217
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002218 # If we have created a new branch then do the "set issue" immediately in
2219 # case the cherry-pick fails, which happens when resolving conflicts.
2220 if newbranch:
2221 self.SetIssue(parsed_issue_arg.issue)
2222
Aaron Gable62619a32017-06-16 08:22:09 -07002223 if force:
2224 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2225 print('Checked out commit for change %i patchset %i locally' %
2226 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002227 elif nocommit:
2228 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2229 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002230 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002231 RunGit(['cherry-pick', 'FETCH_HEAD'])
2232 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002233 (parsed_issue_arg.issue, patchset))
2234 print('Note: this created a local commit which does not have '
2235 'the same hash as the one uploaded for review. This will make '
2236 'uploading changes based on top of this branch difficult.\n'
2237 'If you want to do that, use "git cl patch --force" instead.')
2238
Stefan Zagerd08043c2017-10-12 12:07:02 -07002239 if self.GetBranch():
2240 self.SetIssue(parsed_issue_arg.issue)
2241 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002242 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002243 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2244 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002245 else:
2246 print('WARNING: You are in detached HEAD state.\n'
2247 'The patch has been applied to your checkout, but you will not be '
2248 'able to upload a new patch set to the gerrit issue.\n'
2249 'Try using the \'-b\' option if you would like to work on a '
2250 'branch and/or upload a new patch set.')
2251
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002252 return 0
2253
tandrii16e0b4e2016-06-07 10:34:28 -07002254 def _GerritCommitMsgHookCheck(self, offer_removal):
2255 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2256 if not os.path.exists(hook):
2257 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002258 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2259 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002260 data = gclient_utils.FileRead(hook)
2261 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2262 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002263 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002264 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002265 'and may interfere with it in subtle ways.\n'
2266 'We recommend you remove the commit-msg hook.')
2267 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002268 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002269 gclient_utils.rm_file_or_tree(hook)
2270 print('Gerrit commit-msg hook removed.')
2271 else:
2272 print('OK, will keep Gerrit commit-msg hook in place.')
2273
Edward Lemur1b52d872019-05-09 21:12:12 +00002274 def _CleanUpOldTraces(self):
2275 """Keep only the last |MAX_TRACES| traces."""
2276 try:
2277 traces = sorted([
2278 os.path.join(TRACES_DIR, f)
2279 for f in os.listdir(TRACES_DIR)
2280 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2281 and not f.startswith('tmp'))
2282 ])
2283 traces_to_delete = traces[:-MAX_TRACES]
2284 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002285 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 except OSError:
2287 print('WARNING: Failed to remove old git traces from\n'
2288 ' %s'
2289 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002290
Edward Lemur5737f022019-05-17 01:24:00 +00002291 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002292 """Zip and write the git push traces stored in traces_dir."""
2293 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002294 traces_zip = trace_name + '-traces'
2295 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002296 # Create a temporary dir to store git config and gitcookies in. It will be
2297 # compressed and stored next to the traces.
2298 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002299 git_info_zip = trace_name + '-git-info'
2300
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002301 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002302
Edward Lemur1b52d872019-05-09 21:12:12 +00002303 git_push_metadata['trace_name'] = trace_name
2304 gclient_utils.FileWrite(
2305 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2306
2307 # Keep only the first 6 characters of the git hashes on the packet
2308 # trace. This greatly decreases size after compression.
2309 packet_traces = os.path.join(traces_dir, 'trace-packet')
2310 if os.path.isfile(packet_traces):
2311 contents = gclient_utils.FileRead(packet_traces)
2312 gclient_utils.FileWrite(
2313 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2314 shutil.make_archive(traces_zip, 'zip', traces_dir)
2315
2316 # Collect and compress the git config and gitcookies.
2317 git_config = RunGit(['config', '-l'])
2318 gclient_utils.FileWrite(
2319 os.path.join(git_info_dir, 'git-config'),
2320 git_config)
2321
2322 cookie_auth = gerrit_util.Authenticator.get()
2323 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2324 gitcookies_path = cookie_auth.get_gitcookies_path()
2325 if os.path.isfile(gitcookies_path):
2326 gitcookies = gclient_utils.FileRead(gitcookies_path)
2327 gclient_utils.FileWrite(
2328 os.path.join(git_info_dir, 'gitcookies'),
2329 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2330 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2331
Edward Lemur1b52d872019-05-09 21:12:12 +00002332 gclient_utils.rmtree(git_info_dir)
2333
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002334 def _RunGitPushWithTraces(self,
2335 refspec,
2336 refspec_opts,
2337 git_push_metadata,
2338 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002339 """Run git push and collect the traces resulting from the execution."""
2340 # Create a temporary directory to store traces in. Traces will be compressed
2341 # and stored in a 'traces' dir inside depot_tools.
2342 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002343 trace_name = os.path.join(
2344 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002345
2346 env = os.environ.copy()
2347 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2348 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002349 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002350 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2351 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2352 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2353
2354 try:
2355 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002356 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002357 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002358 push_cmd = ['git', 'push', remote_url, refspec]
2359 if git_push_options:
2360 for opt in git_push_options:
2361 push_cmd.extend(['-o', opt])
2362
Edward Lemur0f58ae42019-04-30 17:24:12 +00002363 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002364 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002365 env=env,
2366 print_stdout=True,
2367 # Flush after every line: useful for seeing progress when running as
2368 # recipe.
2369 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002370 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002371 except subprocess2.CalledProcessError as e:
2372 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002373 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002374 raise GitPushError(
2375 'Failed to create a change, very likely due to blocked keyword. '
2376 'Please examine output above for the reason of the failure.\n'
2377 'If this is a false positive, you can try to bypass blocked '
2378 'keyword by using push option '
2379 '-o uploadvalidator~skip, e.g.:\n'
2380 'git cl upload -o uploadvalidator~skip\n\n'
2381 'If git-cl is not working correctly, file a bug under the '
2382 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002383 if 'git push -o nokeycheck' in str(e.stdout):
2384 raise GitPushError(
2385 'Failed to create a change, very likely due to a private key being '
2386 'detected. Please examine output above for the reason of the '
2387 'failure.\n'
2388 'If this is a false positive, you can try to bypass private key '
2389 'detection by using push option '
2390 '-o nokeycheck, e.g.:\n'
2391 'git cl upload -o nokeycheck\n\n'
2392 'If git-cl is not working correctly, file a bug under the '
2393 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002394
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002395 raise GitPushError(
2396 'Failed to create a change. Please examine output above for the '
2397 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002398 'For emergencies, Googlers can escalate to '
2399 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002400 'Hint: run command below to diagnose common Git/Gerrit '
2401 'credential problems:\n'
2402 ' git cl creds-check\n'
2403 '\n'
2404 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2405 'component including the files below.\n'
2406 'Review the files before upload, since they might contain sensitive '
2407 'information.\n'
2408 'Set the Restrict-View-Google label so that they are not publicly '
2409 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002410 finally:
2411 execution_time = time_time() - before_push
2412 metrics.collector.add_repeated('sub_commands', {
2413 'command': 'git push',
2414 'execution_time': execution_time,
2415 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002416 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002417 })
2418
Edward Lemur1b52d872019-05-09 21:12:12 +00002419 git_push_metadata['execution_time'] = execution_time
2420 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002421 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002422
Edward Lemur1b52d872019-05-09 21:12:12 +00002423 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002424 gclient_utils.rmtree(traces_dir)
2425
2426 return push_stdout
2427
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002428 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2429 change_desc):
2430 """Upload the current branch to Gerrit, retry if new remote HEAD is
2431 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002432 remote, remote_branch = self.GetRemoteBranch()
2433 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2434
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002435 try:
2436 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002437 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002438 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002439 # Repository might be in the middle of transition to main branch as
2440 # default, and uploads to old default might be blocked.
2441 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002442 DieWithError(str(e), change_desc)
2443
Josip Sokcevicb631a882021-01-06 18:18:10 +00002444 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2445 self.GetGerritProject())
2446 if project_head == branch:
2447 DieWithError(str(e), change_desc)
2448 branch = project_head
2449
2450 print("WARNING: Fetching remote state and retrying upload to default "
2451 "branch...")
2452 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002453 options.edit_description = False
2454 options.force = True
2455 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002456 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2457 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002458 except GitPushError as e:
2459 DieWithError(str(e), change_desc)
2460
2461 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002462 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002464 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002465 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002466 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002467 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002468 # User requested to change description
2469 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002470 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002471 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2472 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002473 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002474
2475 # Check if changes outside of this workspace have been uploaded.
2476 current_rev = change_detail['current_revision']
2477 last_uploaded_rev = self._GitGetBranchConfigValue(
2478 GERRIT_SQUASH_HASH_CONFIG_KEY)
2479 if last_uploaded_rev and current_rev != last_uploaded_rev:
2480 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002481 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002482 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002483 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002484 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002485 if len(change_ids) == 1:
2486 change_id = change_ids[0]
2487 else:
2488 change_id = GenerateGerritChangeId(change_desc.description)
2489 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002490
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002491 if options.preserve_tryjobs:
2492 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002493
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002494 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002495 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002496 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002497 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002498 with gclient_utils.temporary_file() as desc_tempfile:
2499 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2500 ref_to_push = RunGit(
2501 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002502 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002503 if options.no_add_changeid:
2504 pass
2505 else: # adding Change-Ids is okay.
2506 if not git_footers.get_footer_change_id(change_desc.description):
2507 DownloadGerritHook(False)
2508 change_desc.set_description(
2509 self._AddChangeIdToCommitMessage(change_desc.description,
2510 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002511 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002512 # For no-squash mode, we assume the remote called "origin" is the one we
2513 # want. It is not worthwhile to support different workflows for
2514 # no-squash mode.
2515 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002516 # attempt to extract the changeid from the current description
2517 # fail informatively if not possible.
2518 change_id_candidates = git_footers.get_footer_change_id(
2519 change_desc.description)
2520 if not change_id_candidates:
2521 DieWithError("Unable to extract change-id from message.")
2522 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002523
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002524 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002525 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2526 ref_to_push)]).splitlines()
2527 if len(commits) > 1:
2528 print('WARNING: This will upload %d commits. Run the following command '
2529 'to see which commits will be uploaded: ' % len(commits))
2530 print('git log %s..%s' % (parent, ref_to_push))
2531 print('You can also use `git squash-branch` to squash these into a '
2532 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002533 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002535 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002536 cc = []
Joanna Wangc8f23e22023-01-19 21:18:10 +00002537 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002538 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2539 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002540 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002541 if len(cc) > 100:
2542 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2543 'process/lsc/lsc_workflow.md')
2544 print('WARNING: This will auto-CC %s users.' % len(cc))
2545 print('LSC may be more appropriate: %s' % lsc)
2546 print('You can also use the --no-autocc flag to disable auto-CC.')
2547 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002548 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002549 if options.cc:
2550 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002551 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002552 if change_desc.get_cced():
2553 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002554 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002555 valid_accounts = set(reviewers + cc)
2556 # TODO(crbug/877717): relax this for all hosts.
2557 else:
2558 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002559 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002560 logging.info('accounts %s are recognized, %s invalid',
2561 sorted(valid_accounts),
2562 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002563
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002564 # Extra options that can be specified at push time. Doc:
2565 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002566 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002567
Aaron Gable844cf292017-06-28 11:32:59 -07002568 # By default, new changes are started in WIP mode, and subsequent patchsets
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002569 # don't send email. At any time, passing --send-mail or --send-email will
2570 # mark the change ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002571 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002572 refspec_opts.append('ready')
2573 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002574 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002575 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002576 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002577 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002578
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002579 # TODO(tandrii): options.message should be posted as a comment if
2580 # --send-mail or --send-email is set on non-initial upload as Rietveld used
2581 # to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002582
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002583 # Set options.title in case user was prompted in _GetTitleForUpload and
2584 # _CMDUploadChange needs to be called again.
2585 options.title = self._GetTitleForUpload(options)
2586 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002587 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002588 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002589 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002590
agablec6787972016-09-09 16:13:34 -07002591 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002592 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002593
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002594 for r in sorted(reviewers):
2595 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002596 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002597 reviewers.remove(r)
2598 else:
2599 # TODO(tandrii): this should probably be a hard failure.
2600 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2601 % r)
2602 for c in sorted(cc):
2603 # refspec option will be rejected if cc doesn't correspond to an
2604 # account, even though REST call to add such arbitrary cc may succeed.
2605 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002606 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002607 cc.remove(c)
2608
rmistry9eadede2016-09-19 11:22:43 -07002609 if options.topic:
2610 # Documentation on Gerrit topics is here:
2611 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002612 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002613
Edward Lemur687ca902018-12-05 02:30:30 +00002614 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002615 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002616 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002617 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002618 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002619 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002620 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002621 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002622 elif options.cq_quick_run:
2623 refspec_opts.append('l=Commit-Queue+1')
2624 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002625
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002626 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002627 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002628 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002629 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002630 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2631
2632 refspec_suffix = ''
2633 if refspec_opts:
2634 refspec_suffix = '%' + ','.join(refspec_opts)
2635 assert ' ' not in refspec_suffix, (
2636 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2637 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002638
Edward Lemur1b52d872019-05-09 21:12:12 +00002639 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002640 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002641 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002642 'change_id': change_id,
2643 'description': change_desc.description,
2644 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002645
Gavin Mak4e5e3992022-11-14 22:40:12 +00002646 # Gerrit may or may not update fast enough to return the correct patchset
2647 # number after we push. Get the pre-upload patchset and increment later.
2648 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2649
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002650 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002651 git_push_metadata,
2652 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002653
2654 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002655 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002656 change_numbers = [m.group(1)
2657 for m in map(regex.match, push_stdout.splitlines())
2658 if m]
2659 if len(change_numbers) != 1:
2660 DieWithError(
2661 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002662 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002663 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002664 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002665 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002666
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002667 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002668 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002669 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002670 gerrit_util.AddReviewers(self.GetGerritHost(),
2671 self._GerritChangeIdentifier(),
2672 reviewers,
2673 cc,
2674 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002675
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002676 return 0
2677
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002678 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2679 change_desc):
2680 """Computes parent of the generated commit to be uploaded to Gerrit.
2681
2682 Returns revision or a ref name.
2683 """
2684 if custom_cl_base:
2685 # Try to avoid creating additional unintended CLs when uploading, unless
2686 # user wants to take this risk.
2687 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2688 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2689 local_ref_of_target_remote])
2690 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002691 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002692 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2693 'If you proceed with upload, more than 1 CL may be created by '
2694 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2695 'If you are certain that specified base `%s` has already been '
2696 'uploaded to Gerrit as another CL, you may proceed.\n' %
2697 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2698 if not force:
2699 confirm_or_exit(
2700 'Do you take responsibility for cleaning up potential mess '
2701 'resulting from proceeding with upload?',
2702 action='upload')
2703 return custom_cl_base
2704
Aaron Gablef97e33d2017-03-30 15:44:27 -07002705 if remote != '.':
2706 return self.GetCommonAncestorWithUpstream()
2707
2708 # If our upstream branch is local, we base our squashed commit on its
2709 # squashed version.
2710 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2711
Aaron Gablef97e33d2017-03-30 15:44:27 -07002712 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002713 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002714 if upstream_branch_name == 'main':
2715 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002716
2717 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002718 # TODO(tandrii): consider checking parent change in Gerrit and using its
2719 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2720 # the tree hash of the parent branch. The upside is less likely bogus
2721 # requests to reupload parent change just because it's uploadhash is
2722 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002723 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2724 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002725 # Verify that the upstream branch has been uploaded too, otherwise
2726 # Gerrit will create additional CLs when uploading.
2727 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2728 RunGitSilent(['rev-parse', parent + ':'])):
2729 DieWithError(
2730 '\nUpload upstream branch %s first.\n'
2731 'It is likely that this branch has been rebased since its last '
2732 'upload, so you just need to upload it again.\n'
2733 '(If you uploaded it with --no-squash, then branch dependencies '
2734 'are not supported, and you should reupload with --squash.)'
2735 % upstream_branch_name,
2736 change_desc)
2737 return parent
2738
Gavin Mak4e5e3992022-11-14 22:40:12 +00002739 def _UpdateWithExternalChanges(self):
2740 """Updates workspace with external changes.
2741
2742 Returns the commit hash that should be used as the merge base on upload.
2743 """
2744 local_ps = self.GetPatchset()
2745 if local_ps is None:
2746 return
2747
2748 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002749 if external_ps is None or local_ps == external_ps or \
2750 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002751 return
2752
2753 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002754 if num_changes > 1:
2755 change_words = 'changes were'
2756 else:
2757 change_words = 'change was'
2758 print('\n%d external %s published to %s:\n' %
2759 (num_changes, change_words, self.GetIssueURL(short=True)))
2760
2761 # Print an overview of external changes.
2762 ps_to_commit = {}
2763 ps_to_info = {}
2764 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2765 for commit_id, revision_info in revisions.get('revisions', {}).items():
2766 ps_num = revision_info['_number']
2767 ps_to_commit[ps_num] = commit_id
2768 ps_to_info[ps_num] = revision_info
2769
2770 for ps in range(external_ps, local_ps, -1):
2771 commit = ps_to_commit[ps][:8]
2772 desc = ps_to_info[ps].get('description', '')
2773 print('Patchset %d [%s] %s' % (ps, commit, desc))
2774
2775 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2776 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002777 return
2778
2779 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2780 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2781 external_base = external_parent['commit']
2782
2783 branch = git_common.current_branch()
2784 local_base = self.GetCommonAncestorWithUpstream()
2785 if local_base != external_base:
2786 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2787 (local_base, external_base))
2788 if git_common.upstream(branch):
2789 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2790 'to make these the same.')
2791 print('No upstream branch set. Consider setting it and using '
2792 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2793
2794 # Fetch Gerrit's CL base if it doesn't exist locally.
2795 remote, _ = self.GetRemoteBranch()
2796 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2797 RunGitSilent(['fetch', remote, external_base])
2798
2799 # Get the diff between local_ps and external_ps.
2800 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002801 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002802 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
2803 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2804 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
2805 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2806 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
2807
2808 # Diff can be empty in the case of trivial rebases.
2809 if not diff:
2810 return external_base
2811
2812 # Apply the diff.
2813 with gclient_utils.temporary_file() as diff_tempfile:
2814 gclient_utils.FileWrite(diff_tempfile, diff)
2815 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
2816 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
2817 if not clean_patch:
2818 # Normally patchset is set after upload. But because we exit, that never
2819 # happens. Updating here makes sure that subsequent uploads don't need
2820 # to fetch/apply the same diff again.
2821 self.SetPatchset(external_ps)
2822 DieWithError('\nPatch did not apply cleanly. Please resolve any '
2823 'conflicts and reupload.')
2824
2825 message = 'Incorporate external changes from '
2826 if num_changes == 1:
2827 message += 'patchset %d' % external_ps
2828 else:
2829 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
2830 RunGitSilent(['commit', '-am', message])
2831 # TODO(crbug.com/1382528): Use the previous commit's message as a default
2832 # patchset title instead of this 'Incorporate' message.
2833 return external_base
2834
Edward Lemura12175c2020-03-09 16:58:26 +00002835 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002836 """Re-commits using the current message, assumes the commit hook is in
2837 place.
2838 """
Edward Lemura12175c2020-03-09 16:58:26 +00002839 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002840 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002841 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002842 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002843 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002844
2845 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002846
tandriie113dfd2016-10-11 10:20:12 -07002847 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002848 try:
2849 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002850 except GerritChangeNotExists:
2851 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002852
2853 if data['status'] in ('ABANDONED', 'MERGED'):
2854 return 'CL %s is closed' % self.GetIssue()
2855
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002856 def GetGerritChange(self, patchset=None):
2857 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002858 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002859 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002860 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002861 data = self._GetChangeDetail(['ALL_REVISIONS'])
2862
2863 assert host and issue and patchset, 'CL must be uploaded first'
2864
2865 has_patchset = any(
2866 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002867 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002868 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002869 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002870 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002871
tandrii8c5a3532016-11-04 07:52:02 -07002872 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002873 'host': host,
2874 'change': issue,
2875 'project': data['project'],
2876 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002877 }
tandriie113dfd2016-10-11 10:20:12 -07002878
tandriide281ae2016-10-12 06:02:30 -07002879 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002880 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002881
Edward Lemur707d70b2018-02-07 00:50:14 +01002882 def GetReviewers(self):
2883 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002884 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002885
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002886
Lei Zhang8a0efc12020-08-05 19:58:45 +00002887def _get_bug_line_values(default_project_prefix, bugs):
2888 """Given default_project_prefix and comma separated list of bugs, yields bug
2889 line values.
tandriif9aefb72016-07-01 09:06:51 -07002890
2891 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002892 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002893 * string, which is left as is.
2894
2895 This function may produce more than one line, because bugdroid expects one
2896 project per line.
2897
Lei Zhang8a0efc12020-08-05 19:58:45 +00002898 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002899 ['v8:123', 'chromium:789']
2900 """
2901 default_bugs = []
2902 others = []
2903 for bug in bugs.split(','):
2904 bug = bug.strip()
2905 if bug:
2906 try:
2907 default_bugs.append(int(bug))
2908 except ValueError:
2909 others.append(bug)
2910
2911 if default_bugs:
2912 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002913 if default_project_prefix:
2914 if not default_project_prefix.endswith(':'):
2915 default_project_prefix += ':'
2916 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002917 else:
2918 yield default_bugs
2919 for other in sorted(others):
2920 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2921 yield other
2922
2923
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002924class ChangeDescription(object):
2925 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002926 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002927 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002928 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002929 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002930 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002931 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2932 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002933 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002934 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002935
Dan Beamd8b04ca2019-10-10 21:23:26 +00002936 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002937 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002938 if bug:
2939 regexp = re.compile(self.BUG_LINE)
2940 prefix = settings.GetBugPrefix()
2941 if not any((regexp.match(line) for line in self._description_lines)):
2942 values = list(_get_bug_line_values(prefix, bug))
2943 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002944 if fixed:
2945 regexp = re.compile(self.FIXED_LINE)
2946 prefix = settings.GetBugPrefix()
2947 if not any((regexp.match(line) for line in self._description_lines)):
2948 values = list(_get_bug_line_values(prefix, fixed))
2949 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002950
agable@chromium.org42c20792013-09-12 17:34:49 +00002951 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002952 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002953 return '\n'.join(self._description_lines)
2954
2955 def set_description(self, desc):
2956 if isinstance(desc, basestring):
2957 lines = desc.splitlines()
2958 else:
2959 lines = [line.rstrip() for line in desc]
2960 while lines and not lines[0]:
2961 lines.pop(0)
2962 while lines and not lines[-1]:
2963 lines.pop(-1)
2964 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002965
Edward Lemur5a644f82020-03-18 16:44:57 +00002966 def ensure_change_id(self, change_id):
2967 description = self.description
2968 footer_change_ids = git_footers.get_footer_change_id(description)
2969 # Make sure that the Change-Id in the description matches the given one.
2970 if footer_change_ids != [change_id]:
2971 if footer_change_ids:
2972 # Remove any existing Change-Id footers since they don't match the
2973 # expected change_id footer.
2974 description = git_footers.remove_footer(description, 'Change-Id')
2975 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2976 'if you want to set a new one.')
2977 # Add the expected Change-Id footer.
2978 description = git_footers.add_footer_change_id(description, change_id)
2979 self.set_description(description)
2980
Joanna Wang39811b12023-01-20 23:09:48 +00002981 def update_reviewers(self, reviewers):
2982 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002983
2984 Args:
2985 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002986 """
Joanna Wang39811b12023-01-20 23:09:48 +00002987 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002988 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002989
2990 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002991
Joanna Wang39811b12023-01-20 23:09:48 +00002992 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002993 regexp = re.compile(self.R_LINE)
2994 matches = [regexp.match(line) for line in self._description_lines]
2995 new_desc = [l for i, l in enumerate(self._description_lines)
2996 if not matches[i]]
2997 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002998
Joanna Wang39811b12023-01-20 23:09:48 +00002999 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003000
Joanna Wang39811b12023-01-20 23:09:48 +00003001 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003002 for match in matches:
3003 if not match:
3004 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003005 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003006
Joanna Wang39811b12023-01-20 23:09:48 +00003007 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003008
3009 # Put the new lines in the description where the old first R= line was.
3010 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3011 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003012 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003013 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003014 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003015
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003016 def set_preserve_tryjobs(self):
3017 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3018 footers = git_footers.parse_footers(self.description)
3019 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3020 if v.lower() == 'true':
3021 return
3022 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3023
Anthony Polito8b955342019-09-24 19:01:36 +00003024 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003025 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003026 self.set_description([
3027 '# Enter a description of the change.',
3028 '# This will be displayed on the codereview site.',
3029 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003030 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003031 '--------------------',
3032 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003033 bug_regexp = re.compile(self.BUG_LINE)
3034 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003035 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003036 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003037
Dan Beamd8b04ca2019-10-10 21:23:26 +00003038 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003039 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003040
Bruce Dawsonfc487042020-10-27 19:11:37 +00003041 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003042 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003043 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003044 if not content:
3045 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003046 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003047
Bruce Dawson2377b012018-01-11 16:46:49 -08003048 # Strip off comments and default inserted "Bug:" line.
3049 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003050 (line.startswith('#') or
3051 line.rstrip() == "Bug:" or
3052 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003053 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003054 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003055 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003056
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003057 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003058 """Adds a footer line to the description.
3059
3060 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3061 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3062 that Gerrit footers are always at the end.
3063 """
3064 parsed_footer_line = git_footers.parse_footer(line)
3065 if parsed_footer_line:
3066 # Line is a gerrit footer in the form: Footer-Key: any value.
3067 # Thus, must be appended observing Gerrit footer rules.
3068 self.set_description(
3069 git_footers.add_footer(self.description,
3070 key=parsed_footer_line[0],
3071 value=parsed_footer_line[1]))
3072 return
3073
3074 if not self._description_lines:
3075 self._description_lines.append(line)
3076 return
3077
3078 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3079 if gerrit_footers:
3080 # git_footers.split_footers ensures that there is an empty line before
3081 # actual (gerrit) footers, if any. We have to keep it that way.
3082 assert top_lines and top_lines[-1] == ''
3083 top_lines, separator = top_lines[:-1], top_lines[-1:]
3084 else:
3085 separator = [] # No need for separator if there are no gerrit_footers.
3086
3087 prev_line = top_lines[-1] if top_lines else ''
3088 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3089 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3090 top_lines.append('')
3091 top_lines.append(line)
3092 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003093
tandrii99a72f22016-08-17 14:33:24 -07003094 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003095 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003096 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003097 reviewers = [match.group(2).strip()
3098 for match in matches
3099 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003100 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003101
bradnelsond975b302016-10-23 12:20:23 -07003102 def get_cced(self):
3103 """Retrieves the list of reviewers."""
3104 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3105 cced = [match.group(2).strip() for match in matches if match]
3106 return cleanup_list(cced)
3107
Nodir Turakulov23b82142017-11-16 11:04:25 -08003108 def get_hash_tags(self):
3109 """Extracts and sanitizes a list of Gerrit hashtags."""
3110 subject = (self._description_lines or ('',))[0]
3111 subject = re.sub(
3112 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3113
3114 tags = []
3115 start = 0
3116 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3117 while True:
3118 m = bracket_exp.match(subject, start)
3119 if not m:
3120 break
3121 tags.append(self.sanitize_hash_tag(m.group(1)))
3122 start = m.end()
3123
3124 if not tags:
3125 # Try "Tag: " prefix.
3126 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3127 if m:
3128 tags.append(self.sanitize_hash_tag(m.group(1)))
3129 return tags
3130
3131 @classmethod
3132 def sanitize_hash_tag(cls, tag):
3133 """Returns a sanitized Gerrit hash tag.
3134
3135 A sanitized hashtag can be used as a git push refspec parameter value.
3136 """
3137 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3138
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003139
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140def FindCodereviewSettingsFile(filename='codereview.settings'):
3141 """Finds the given file starting in the cwd and going up.
3142
3143 Only looks up to the top of the repository unless an
3144 'inherit-review-settings-ok' file exists in the root of the repository.
3145 """
3146 inherit_ok_file = 'inherit-review-settings-ok'
3147 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003148 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003149 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003150 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003151 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003152 if os.path.isfile(os.path.join(cwd, filename)):
3153 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003154 if cwd == root:
3155 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003156 parent_dir = os.path.dirname(cwd)
3157 if parent_dir == cwd:
3158 # We hit the system root directory.
3159 break
3160 cwd = parent_dir
3161 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003162
3163
3164def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003165 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003166 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003167
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003168 def SetProperty(name, setting, unset_error_ok=False):
3169 fullname = 'rietveld.' + name
3170 if setting in keyvals:
3171 RunGit(['config', fullname, keyvals[setting]])
3172 else:
3173 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3174
tandrii48df5812016-10-17 03:55:37 -07003175 if not keyvals.get('GERRIT_HOST', False):
3176 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003177 # Only server setting is required. Other settings can be absent.
3178 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003179 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003180 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3181 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003182 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003183 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3184 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003185 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3186 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003187 SetProperty(
3188 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003189 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003190
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003191 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003192 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003193
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003194 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003195 RunGit(['config', 'gerrit.squash-uploads',
3196 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003197
tandrii@chromium.org28253532016-04-14 13:46:56 +00003198 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003199 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003200 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003202 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003203 # should be of the form
3204 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3205 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003206 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3207 keyvals['ORIGIN_URL_CONFIG']])
3208
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003209
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003210def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003211 """Downloads a network object to a local file, like urllib.urlretrieve.
3212
3213 This is necessary because urllib is broken for SSL connections via a proxy.
3214 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003215 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003216 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003217
3218
ukai@chromium.org712d6102013-11-27 00:52:58 +00003219def hasSheBang(fname):
3220 """Checks fname is a #! script."""
3221 with open(fname) as f:
3222 return f.read(2).startswith('#!')
3223
3224
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003225def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003226 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003227
3228 Args:
3229 force: True to update hooks. False to install hooks if not present.
3230 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003231 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003232 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3233 if not os.access(dst, os.X_OK):
3234 if os.path.exists(dst):
3235 if not force:
3236 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003237 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003238 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003239 if not hasSheBang(dst):
3240 DieWithError('Not a script: %s\n'
3241 'You need to download from\n%s\n'
3242 'into .git/hooks/commit-msg and '
3243 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003244 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3245 except Exception:
3246 if os.path.exists(dst):
3247 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003248 DieWithError('\nFailed to download hooks.\n'
3249 'You need to download from\n%s\n'
3250 'into .git/hooks/commit-msg and '
3251 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003252
3253
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003254class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003255 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003256
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003257 def __init__(self):
3258 # Cached list of [host, identity, source], where source is either
3259 # .gitcookies or .netrc.
3260 self._all_hosts = None
3261
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003262 def ensure_configured_gitcookies(self):
3263 """Runs checks and suggests fixes to make git use .gitcookies from default
3264 path."""
3265 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3266 configured_path = RunGitSilent(
3267 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003268 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003269 if configured_path:
3270 self._ensure_default_gitcookies_path(configured_path, default)
3271 else:
3272 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003273
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003274 @staticmethod
3275 def _ensure_default_gitcookies_path(configured_path, default_path):
3276 assert configured_path
3277 if configured_path == default_path:
3278 print('git is already configured to use your .gitcookies from %s' %
3279 configured_path)
3280 return
3281
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003282 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003283 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3284 (configured_path, default_path))
3285
3286 if not os.path.exists(configured_path):
3287 print('However, your configured .gitcookies file is missing.')
3288 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3289 action='reconfigure')
3290 RunGit(['config', '--global', 'http.cookiefile', default_path])
3291 return
3292
3293 if os.path.exists(default_path):
3294 print('WARNING: default .gitcookies file already exists %s' %
3295 default_path)
3296 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3297 default_path)
3298
3299 confirm_or_exit('Move existing .gitcookies to default location?',
3300 action='move')
3301 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003302 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003303 print('Moved and reconfigured git to use .gitcookies from %s' %
3304 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003305
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003306 @staticmethod
3307 def _configure_gitcookies_path(default_path):
3308 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3309 if os.path.exists(netrc_path):
3310 print('You seem to be using outdated .netrc for git credentials: %s' %
3311 netrc_path)
3312 print('This tool will guide you through setting up recommended '
3313 '.gitcookies store for git credentials.\n'
3314 '\n'
3315 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3316 ' git config --global --unset http.cookiefile\n'
3317 ' mv %s %s.backup\n\n' % (default_path, default_path))
3318 confirm_or_exit(action='setup .gitcookies')
3319 RunGit(['config', '--global', 'http.cookiefile', default_path])
3320 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003321
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003322 def get_hosts_with_creds(self, include_netrc=False):
3323 if self._all_hosts is None:
3324 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003325 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3326 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3327 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3328 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003329
3330 if include_netrc:
3331 return self._all_hosts
3332 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3333
3334 def print_current_creds(self, include_netrc=False):
3335 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3336 if not hosts:
3337 print('No Git/Gerrit credentials found')
3338 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003339 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003340 header = [('Host', 'User', 'Which file'),
3341 ['=' * l for l in lengths]]
3342 for row in (header + hosts):
3343 print('\t'.join((('%%+%ds' % l) % s)
3344 for l, s in zip(lengths, row)))
3345
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003346 @staticmethod
3347 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003348 """Parses identity "git-<username>.domain" into <username> and domain."""
3349 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003350 # distinguishable from sub-domains. But we do know typical domains:
3351 if identity.endswith('.chromium.org'):
3352 domain = 'chromium.org'
3353 username = identity[:-len('.chromium.org')]
3354 else:
3355 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003356 if username.startswith('git-'):
3357 username = username[len('git-'):]
3358 return username, domain
3359
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003360 def has_generic_host(self):
3361 """Returns whether generic .googlesource.com has been configured.
3362
3363 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3364 """
3365 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003366 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003367 return True
3368 return False
3369
3370 def _get_git_gerrit_identity_pairs(self):
3371 """Returns map from canonic host to pair of identities (Git, Gerrit).
3372
3373 One of identities might be None, meaning not configured.
3374 """
3375 host_to_identity_pairs = {}
3376 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003377 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003378 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3379 idx = 0 if canonical == host else 1
3380 pair[idx] = identity
3381 return host_to_identity_pairs
3382
3383 def get_partially_configured_hosts(self):
3384 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003385 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003386 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003387 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003388
3389 def get_conflicting_hosts(self):
3390 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003391 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003392 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003393 if None not in (i1, i2) and i1 != i2)
3394
3395 def get_duplicated_hosts(self):
3396 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003397 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003398
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003399
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003400 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003401 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003402 hosts = sorted(hosts)
3403 assert hosts
3404 if extra_column_func is None:
3405 extras = [''] * len(hosts)
3406 else:
3407 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003408 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3409 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003410 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003411 lines.append(tmpl % he)
3412 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003413
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003414 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003415 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003416 yield ('.googlesource.com wildcard record detected',
3417 ['Chrome Infrastructure team recommends to list full host names '
3418 'explicitly.'],
3419 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003420
3421 dups = self.get_duplicated_hosts()
3422 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003423 yield ('The following hosts were defined twice',
3424 self._format_hosts(dups),
3425 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003426
3427 partial = self.get_partially_configured_hosts()
3428 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003429 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3430 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003431 self._format_hosts(
3432 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3433 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003434
3435 conflicting = self.get_conflicting_hosts()
3436 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003437 yield ('The following Git hosts have differing credentials from their '
3438 'Gerrit counterparts',
3439 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3440 tuple(self._get_git_gerrit_identity_pairs()[host])),
3441 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003442
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003443 def find_and_report_problems(self):
3444 """Returns True if there was at least one problem, else False."""
3445 found = False
3446 bad_hosts = set()
3447 for title, sublines, hosts in self._find_problems():
3448 if not found:
3449 found = True
3450 print('\n\n.gitcookies problem report:\n')
3451 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003452 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003453 if sublines:
3454 print()
3455 print(' %s' % '\n '.join(sublines))
3456 print()
3457
3458 if bad_hosts:
3459 assert found
3460 print(' You can manually remove corresponding lines in your %s file and '
3461 'visit the following URLs with correct account to generate '
3462 'correct credential lines:\n' %
3463 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003464 print(' %s' % '\n '.join(
3465 sorted(
3466 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3467 _canonical_git_googlesource_host(host))
3468 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003469 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003470
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003471
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003472@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003473def CMDcreds_check(parser, args):
3474 """Checks credentials and suggests changes."""
3475 _, _ = parser.parse_args(args)
3476
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003477 # Code below checks .gitcookies. Abort if using something else.
3478 authn = gerrit_util.Authenticator.get()
3479 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003480 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003481 'This command is not designed for bot environment. It checks '
3482 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003483 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3484 if isinstance(authn, gerrit_util.GceAuthenticator):
3485 message += (
3486 '\n'
3487 'If you need to run this on GCE or a cloudtop instance, '
3488 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3489 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003490
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003491 checker = _GitCookiesChecker()
3492 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003493
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003494 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003495 checker.print_current_creds(include_netrc=True)
3496
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003497 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003498 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003499 return 0
3500 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003501
3502
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003503@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003504def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003505 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003506 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003507 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003508 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003509 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003510 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003511 return RunGit(['config', 'branch.%s.base-url' % branch],
3512 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003513
3514 print('Setting base-url to %s' % args[0])
3515 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3516 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003517
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003518
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003519def color_for_status(status):
3520 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003521 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003522 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003523 'unsent': BOLD + Fore.YELLOW,
3524 'waiting': BOLD + Fore.RED,
3525 'reply': BOLD + Fore.YELLOW,
3526 'not lgtm': BOLD + Fore.RED,
3527 'lgtm': BOLD + Fore.GREEN,
3528 'commit': BOLD + Fore.MAGENTA,
3529 'closed': BOLD + Fore.CYAN,
3530 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003531 }.get(status, Fore.WHITE)
3532
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003533
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003534def get_cl_statuses(changes, fine_grained, max_processes=None):
3535 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003536
3537 If fine_grained is true, this will fetch CL statuses from the server.
3538 Otherwise, simply indicate if there's a matching url for the given branches.
3539
3540 If max_processes is specified, it is used as the maximum number of processes
3541 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3542 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003543
3544 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003545 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003546 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003547 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003548
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003549 if not fine_grained:
3550 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003551 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003552 for cl in changes:
3553 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003554 return
3555
3556 # First, sort out authentication issues.
3557 logging.debug('ensuring credentials exist')
3558 for cl in changes:
3559 cl.EnsureAuthenticated(force=False, refresh=True)
3560
3561 def fetch(cl):
3562 try:
3563 return (cl, cl.GetStatus())
3564 except:
3565 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003566 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003567 raise
3568
3569 threads_count = len(changes)
3570 if max_processes:
3571 threads_count = max(1, min(threads_count, max_processes))
3572 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3573
Edward Lemur61bf4172020-02-24 23:22:37 +00003574 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003575 fetched_cls = set()
3576 try:
3577 it = pool.imap_unordered(fetch, changes).__iter__()
3578 while True:
3579 try:
3580 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003581 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003582 break
3583 fetched_cls.add(cl)
3584 yield cl, status
3585 finally:
3586 pool.close()
3587
3588 # Add any branches that failed to fetch.
3589 for cl in set(changes) - fetched_cls:
3590 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003591
rmistry@google.com2dd99862015-06-22 12:22:18 +00003592
Jose Lopes3863fc52020-04-07 17:00:25 +00003593def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003594 """Uploads CLs of local branches that are dependents of the current branch.
3595
3596 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003597
3598 test1 -> test2.1 -> test3.1
3599 -> test3.2
3600 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003601
3602 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3603 run on the dependent branches in this order:
3604 test2.1, test3.1, test3.2, test2.2, test3.3
3605
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003606 Note: This function does not rebase your local dependent branches. Use it
3607 when you make a change to the parent branch that will not conflict
3608 with its dependent branches, and you would like their dependencies
3609 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003610 """
3611 if git_common.is_dirty_git_tree('upload-branch-deps'):
3612 return 1
3613
3614 root_branch = cl.GetBranch()
3615 if root_branch is None:
3616 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3617 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003618 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003619 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3620 'patchset dependencies without an uploaded CL.')
3621
3622 branches = RunGit(['for-each-ref',
3623 '--format=%(refname:short) %(upstream:short)',
3624 'refs/heads'])
3625 if not branches:
3626 print('No local branches found.')
3627 return 0
3628
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003629 # Create a dictionary of all local branches to the branches that are
3630 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003631 tracked_to_dependents = collections.defaultdict(list)
3632 for b in branches.splitlines():
3633 tokens = b.split()
3634 if len(tokens) == 2:
3635 branch_name, tracked = tokens
3636 tracked_to_dependents[tracked].append(branch_name)
3637
vapiera7fbd5a2016-06-16 09:17:49 -07003638 print()
3639 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003640 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003641
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642 def traverse_dependents_preorder(branch, padding=''):
3643 dependents_to_process = tracked_to_dependents.get(branch, [])
3644 padding += ' '
3645 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003646 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003647 dependents.append(dependent)
3648 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003649
rmistry@google.com2dd99862015-06-22 12:22:18 +00003650 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003651 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652
3653 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003654 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003655 return 0
3656
Jose Lopes3863fc52020-04-07 17:00:25 +00003657 if not force:
3658 confirm_or_exit('This command will checkout all dependent branches and run '
3659 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660
rmistry@google.com2dd99862015-06-22 12:22:18 +00003661 # Record all dependents that failed to upload.
3662 failures = {}
3663 # Go through all dependents, checkout the branch and upload.
3664 try:
3665 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003666 print()
3667 print('--------------------------------------')
3668 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003669 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003670 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003671 try:
3672 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003673 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003674 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003675 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003676 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003678 finally:
3679 # Swap back to the original root branch.
3680 RunGit(['checkout', '-q', root_branch])
3681
vapiera7fbd5a2016-06-16 09:17:49 -07003682 print()
3683 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003684 for dependent_branch in dependents:
3685 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print(' %s : %s' % (dependent_branch, upload_status))
3687 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003688
3689 return 0
3690
3691
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003692def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003693 """Given a proposed tag name, returns a tag name that is guaranteed to be
3694 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3695 or 'foo-3', and so on."""
3696
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003697 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003698 for suffix_num in itertools.count(1):
3699 if suffix_num == 1:
3700 to_check = proposed_tag
3701 else:
3702 to_check = '%s-%d' % (proposed_tag, suffix_num)
3703
3704 if to_check not in existing_tags:
3705 return to_check
3706
3707
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003708@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003709def CMDarchive(parser, args):
3710 """Archives and deletes branches associated with closed changelists."""
3711 parser.add_option(
3712 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003713 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003714 parser.add_option(
3715 '-f', '--force', action='store_true',
3716 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003717 parser.add_option(
3718 '-d', '--dry-run', action='store_true',
3719 help='Skip the branch tagging and removal steps.')
3720 parser.add_option(
3721 '-t', '--notags', action='store_true',
3722 help='Do not tag archived branches. '
3723 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003724 parser.add_option(
3725 '-p',
3726 '--pattern',
3727 default='git-cl-archived-{issue}-{branch}',
3728 help='Format string for archive tags. '
3729 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003730
kmarshall3bff56b2016-06-06 18:31:47 -07003731 options, args = parser.parse_args(args)
3732 if args:
3733 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003734
3735 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3736 if not branches:
3737 return 0
3738
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003739 tags = RunGit(['for-each-ref', '--format=%(refname)',
3740 'refs/tags']).splitlines() or []
3741 tags = [t.split('/')[-1] for t in tags]
3742
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003744 changes = [Changelist(branchref=b)
3745 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003746 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3747 statuses = get_cl_statuses(changes,
3748 fine_grained=True,
3749 max_processes=options.maxjobs)
3750 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003751 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3752 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003753 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003754 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003755 proposal.sort()
3756
3757 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003759 return 0
3760
Edward Lemur85153282020-02-14 22:06:29 +00003761 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003762
vapiera7fbd5a2016-06-16 09:17:49 -07003763 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003764 if options.notags:
3765 for next_item in proposal:
3766 print(' ' + next_item[0])
3767 else:
3768 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3769 for next_item in proposal:
3770 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003771
kmarshall9249e012016-08-23 12:02:16 -07003772 # Quit now on precondition failure or if instructed by the user, either
3773 # via an interactive prompt or by command line flags.
3774 if options.dry_run:
3775 print('\nNo changes were made (dry run).\n')
3776 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003777
3778 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003779 print('You are currently on a branch \'%s\' which is associated with a '
3780 'closed codereview issue, so archive cannot proceed. Please '
3781 'checkout another branch and run this command again.' %
3782 current_branch)
3783 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003784
3785 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003786 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003787 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003788 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003789 return 1
3790
3791 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003792 if not options.notags:
3793 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003794
3795 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3796 # Clean up the tag if we failed to delete the branch.
3797 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003798
vapiera7fbd5a2016-06-16 09:17:49 -07003799 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003800
3801 return 0
3802
3803
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003804@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003806 """Show status of changelists.
3807
3808 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003809 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003810 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003811 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003812 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003813 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003814 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003815 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003816
3817 Also see 'git cl comments'.
3818 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003819 parser.add_option(
3820 '--no-branch-color',
3821 action='store_true',
3822 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003823 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003824 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003825 parser.add_option('-f', '--fast', action='store_true',
3826 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003827 parser.add_option(
3828 '-j', '--maxjobs', action='store', type=int,
3829 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003830 parser.add_option(
3831 '-i', '--issue', type=int,
3832 help='Operate on this issue instead of the current branch\'s implicit '
3833 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003834 parser.add_option('-d',
3835 '--date-order',
3836 action='store_true',
3837 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003838 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003839 if args:
3840 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003841
iannuccie53c9352016-08-17 14:40:40 -07003842 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003843 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003844
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003845 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003846 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003848 if cl.GetIssue():
3849 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850 elif options.field == 'id':
3851 issueid = cl.GetIssue()
3852 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003854 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003855 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003856 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003857 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003858 elif options.field == 'status':
3859 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860 elif options.field == 'url':
3861 url = cl.GetIssueURL()
3862 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003864 return 0
3865
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003866 branches = RunGit([
3867 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3868 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003869 if not branches:
3870 print('No local branch found.')
3871 return 0
3872
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003873 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003874 Changelist(branchref=b, commit_date=ct)
3875 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3876 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003878 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003879 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003880 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003881
Edward Lemur85153282020-02-14 22:06:29 +00003882 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003883
3884 def FormatBranchName(branch, colorize=False):
3885 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3886 an asterisk when it is the current branch."""
3887
3888 asterisk = ""
3889 color = Fore.RESET
3890 if branch == current_branch:
3891 asterisk = "* "
3892 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003893 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003894
3895 if colorize:
3896 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003897 return asterisk + branch_name
3898
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003899 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003900
3901 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003902
3903 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003904 sorted_changes = sorted(changes,
3905 key=lambda c: c.GetCommitDate(),
3906 reverse=True)
3907 else:
3908 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3909 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003910 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003911 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003912 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003913 branch_statuses[c.GetBranch()] = status
3914 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003915 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003916 if url and (not status or status == 'error'):
3917 # The issue probably doesn't exist anymore.
3918 url += ' (broken)'
3919
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003920 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003921 # Turn off bold as well as colors.
3922 END = '\033[0m'
3923 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003924 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003925 color = ''
3926 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003927 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003928
Alan Cuttera3be9a52019-03-04 18:50:33 +00003929 branch_display = FormatBranchName(branch)
3930 padding = ' ' * (alignment - len(branch_display))
3931 if not options.no_branch_color:
3932 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003933
Alan Cuttera3be9a52019-03-04 18:50:33 +00003934 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3935 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003936
vapiera7fbd5a2016-06-16 09:17:49 -07003937 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003938 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003939 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003940 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003941 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003942 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003943 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003944 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003945 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003946 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003947 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003948 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003949 return 0
3950
3951
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003952def colorize_CMDstatus_doc():
3953 """To be called once in main() to add colors to git cl status help."""
3954 colors = [i for i in dir(Fore) if i[0].isupper()]
3955
3956 def colorize_line(line):
3957 for color in colors:
3958 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003959 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003960 indent = len(line) - len(line.lstrip(' ')) + 1
3961 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3962 return line
3963
3964 lines = CMDstatus.__doc__.splitlines()
3965 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3966
3967
phajdan.jre328cf92016-08-22 04:12:17 -07003968def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003969 if path == '-':
3970 json.dump(contents, sys.stdout)
3971 else:
3972 with open(path, 'w') as f:
3973 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003974
3975
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003976@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003977@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003978def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003979 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003980
3981 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003982 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003983 parser.add_option('-r', '--reverse', action='store_true',
3984 help='Lookup the branch(es) for the specified issues. If '
3985 'no issues are specified, all branches with mapped '
3986 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003987 parser.add_option('--json',
3988 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003989 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003990
dnj@chromium.org406c4402015-03-03 17:22:28 +00003991 if options.reverse:
3992 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003993 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003994 # Reverse issue lookup.
3995 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003996
3997 git_config = {}
3998 for config in RunGit(['config', '--get-regexp',
3999 r'branch\..*issue']).splitlines():
4000 name, _space, val = config.partition(' ')
4001 git_config[name] = val
4002
dnj@chromium.org406c4402015-03-03 17:22:28 +00004003 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004004 issue = git_config.get(
4005 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004006 if issue:
4007 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004008 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004009 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004010 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004011 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004012 try:
4013 issue_num = int(issue)
4014 except ValueError:
4015 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004016 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004017 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004018 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004019 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004020 if options.json:
4021 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004022 return 0
4023
4024 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004025 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004026 if not issue.valid:
4027 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4028 'or no argument to list it.\n'
4029 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004030 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004031 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004032 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004033 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004034 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4035 if options.json:
4036 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004037 'gerrit_host': cl.GetGerritHost(),
4038 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004039 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004040 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004041 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 return 0
4043
4044
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004045@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004046def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004047 """Shows or posts review comments for any changelist."""
4048 parser.add_option('-a', '--add-comment', dest='comment',
4049 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004050 parser.add_option('-p', '--publish', action='store_true',
4051 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004052 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004053 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004054 parser.add_option('-m', '--machine-readable', dest='readable',
4055 action='store_false', default=True,
4056 help='output comments in a format compatible with '
4057 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004058 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004059 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004060 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004061
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004062 issue = None
4063 if options.issue:
4064 try:
4065 issue = int(options.issue)
4066 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004067 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004068
Edward Lemur934836a2019-09-09 20:16:54 +00004069 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004070
4071 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004072 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004073 return 0
4074
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004075 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4076 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004077 for comment in summary:
4078 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004079 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004080 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004081 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004082 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004083 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004084 elif comment.autogenerated:
4085 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004086 else:
4087 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004088 print('\n%s%s %s%s\n%s' % (
4089 color,
4090 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4091 comment.sender,
4092 Fore.RESET,
4093 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4094
smut@google.comc85ac942015-09-15 16:34:43 +00004095 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004096 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004097 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004098 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4099 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004100 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004101 return 0
4102
4103
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004104@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004105@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004106def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004107 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004108 parser.add_option('-d', '--display', action='store_true',
4109 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004110 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004111 help='New description to set for this issue (- for stdin, '
4112 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004113 parser.add_option('-f', '--force', action='store_true',
4114 help='Delete any unpublished Gerrit edits for this issue '
4115 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004116
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004117 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004118
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004119 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004120 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004121 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004122 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004123 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004124
Edward Lemur934836a2019-09-09 20:16:54 +00004125 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004126 if target_issue_arg:
4127 kwargs['issue'] = target_issue_arg.issue
4128 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004129
4130 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004131 if not cl.GetIssue():
4132 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004133
Edward Lemur678a6842019-10-03 22:25:05 +00004134 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004135 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004136
Edward Lemur6c6827c2020-02-06 21:15:18 +00004137 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004138
smut@google.com34fb6b12015-07-13 20:03:26 +00004139 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004140 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004141 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004142
4143 if options.new_description:
4144 text = options.new_description
4145 if text == '-':
4146 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004147 elif text == '+':
4148 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004149 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004150
4151 description.set_description(text)
4152 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004153 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004154 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004155 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004156 return 0
4157
4158
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004159@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004160def CMDlint(parser, args):
4161 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004162 parser.add_option('--filter', action='append', metavar='-x,+y',
4163 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004164 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004165
4166 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004167 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004168 try:
4169 import cpplint
4170 import cpplint_chromium
4171 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004172 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004173 return 1
4174
4175 # Change the current working directory before calling lint so that it
4176 # shows the correct base.
4177 previous_cwd = os.getcwd()
4178 os.chdir(settings.GetRoot())
4179 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004180 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004181 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004182 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004183 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004184 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004185
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004186 # Process cpplint arguments, if any.
4187 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4188 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004189 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190
Lei Zhang379d1ad2020-07-15 19:40:06 +00004191 include_regex = re.compile(settings.GetLintRegex())
4192 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004193 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4194 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004195 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004196 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004197 continue
4198
4199 if ignore_regex.match(filename):
4200 print('Ignoring file %s' % filename)
4201 continue
4202
4203 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4204 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004205 finally:
4206 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004207 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004208 if cpplint._cpplint_state.error_count != 0:
4209 return 1
4210 return 0
4211
4212
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004213@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004215 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004216 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004217 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004218 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004219 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004220 parser.add_option('--all', action='store_true',
4221 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004222 parser.add_option('--files',
4223 nargs=1,
4224 help='Semicolon-separated list of files to be marked as '
4225 'modified when executing presubmit or post-upload hooks. '
4226 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004227 parser.add_option('--parallel', action='store_true',
4228 help='Run all tests specified by input_api.RunTests in all '
4229 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004230 parser.add_option('--resultdb', action='store_true',
4231 help='Run presubmit checks in the ResultSink environment '
4232 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004233 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004234 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
sbc@chromium.org71437c02015-04-09 19:29:40 +00004236 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004238 return 1
4239
Edward Lemur934836a2019-09-09 20:16:54 +00004240 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004241 if args:
4242 base_branch = args[0]
4243 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004244 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004245 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004247 start = time.time()
4248 try:
4249 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4250 description = cl.FetchDescription()
4251 else:
4252 description = _create_description_from_log([base_branch])
4253 except Exception as e:
4254 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004255 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004256 elapsed = time.time() - start
4257 if elapsed > 5:
4258 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004259
Bruce Dawson13acea32022-05-03 22:13:08 +00004260 if not base_branch:
4261 if not options.force:
4262 print('use --force to check even when not on a branch.')
4263 return 1
4264 base_branch = 'HEAD'
4265
Josip Sokcevic017544d2022-03-31 23:47:53 +00004266 cl.RunHook(committing=not options.upload,
4267 may_prompt=False,
4268 verbose=options.verbose,
4269 parallel=options.parallel,
4270 upstream=base_branch,
4271 description=description,
4272 all_files=options.all,
4273 files=options.files,
4274 resultdb=options.resultdb,
4275 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004276 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004277
4278
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004279def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004280 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004281
4282 Works the same way as
4283 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4284 but can be called on demand on all platforms.
4285
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004286 The basic idea is to generate git hash of a state of the tree, original
4287 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004288 """
4289 lines = []
4290 tree_hash = RunGitSilent(['write-tree'])
4291 lines.append('tree %s' % tree_hash.strip())
4292 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4293 if code == 0:
4294 lines.append('parent %s' % parent.strip())
4295 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4296 lines.append('author %s' % author.strip())
4297 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4298 lines.append('committer %s' % committer.strip())
4299 lines.append('')
4300 # Note: Gerrit's commit-hook actually cleans message of some lines and
4301 # whitespace. This code is not doing this, but it clearly won't decrease
4302 # entropy.
4303 lines.append(message)
4304 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004305 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004306 return 'I%s' % change_hash.strip()
4307
4308
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004309def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004310 """Computes the remote branch ref to use for the CL.
4311
4312 Args:
4313 remote (str): The git remote for the CL.
4314 remote_branch (str): The git remote branch for the CL.
4315 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004316 """
4317 if not (remote and remote_branch):
4318 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004319
wittman@chromium.org455dc922015-01-26 20:15:50 +00004320 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004321 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004322 # refs, which are then translated into the remote full symbolic refs
4323 # below.
4324 if '/' not in target_branch:
4325 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4326 else:
4327 prefix_replacements = (
4328 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4329 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4330 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4331 )
4332 match = None
4333 for regex, replacement in prefix_replacements:
4334 match = re.search(regex, target_branch)
4335 if match:
4336 remote_branch = target_branch.replace(match.group(0), replacement)
4337 break
4338 if not match:
4339 # This is a branch path but not one we recognize; use as-is.
4340 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004341 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004342 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004343 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004344 # Handle the refs that need to land in different refs.
4345 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004346
wittman@chromium.org455dc922015-01-26 20:15:50 +00004347 # Create the true path to the remote branch.
4348 # Does the following translation:
4349 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004350 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004351 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4352 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4353 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4354 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4355 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4356 'refs/heads/')
4357 elif remote_branch.startswith('refs/remotes/branch-heads'):
4358 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004359
wittman@chromium.org455dc922015-01-26 20:15:50 +00004360 return remote_branch
4361
4362
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004363def cleanup_list(l):
4364 """Fixes a list so that comma separated items are put as individual items.
4365
4366 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4367 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4368 """
4369 items = sum((i.split(',') for i in l), [])
4370 stripped_items = (i.strip() for i in items)
4371 return sorted(filter(None, stripped_items))
4372
4373
Aaron Gable4db38df2017-11-03 14:59:07 -07004374@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004375@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004376def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004377 """Uploads the current changelist to codereview.
4378
4379 Can skip dependency patchset uploads for a branch by running:
4380 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004381 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004382 git config --unset branch.branch_name.skip-deps-uploads
4383 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004384
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004385 If the name of the checked out branch starts with "bug-" or "fix-" followed
4386 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004387 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004388
4389 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004390 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004391 [git-cl] add support for hashtags
4392 Foo bar: implement foo
4393 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004394 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004395 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4396 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004397 parser.add_option('--bypass-watchlists', action='store_true',
4398 dest='bypass_watchlists',
4399 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004400 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004401 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004402 parser.add_option('--message', '-m', dest='message',
4403 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004404 parser.add_option('-b', '--bug',
4405 help='pre-populate the bug number(s) for this issue. '
4406 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004407 parser.add_option('--message-file', dest='message_file',
4408 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004409 parser.add_option('--title', '-t', dest='title',
4410 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004411 parser.add_option('-T', '--skip-title', action='store_true',
4412 dest='skip_title',
4413 help='Use the most recent commit message as the title of '
4414 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004415 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004416 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004417 help='reviewer email addresses')
4418 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004419 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004420 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004421 parser.add_option('--hashtag', dest='hashtags',
4422 action='append', default=[],
4423 help=('Gerrit hashtag for new CL; '
4424 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004425 parser.add_option('-s',
4426 '--send-mail',
4427 '--send-email',
4428 dest='send_mail',
4429 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004430 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004431 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004432 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004433 metavar='TARGET',
4434 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004435 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004436 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004437 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004438 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004439 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004440 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004441 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004442 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4443 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004444 parser.add_option('-c',
4445 '--use-commit-queue',
4446 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004447 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004448 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004449 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004450 parser.add_option('-d', '--cq-dry-run',
4451 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004452 help='Send the patchset to do a CQ dry run right after '
4453 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004454 parser.add_option(
4455 '-q',
4456 '--cq-quick-run',
4457 action='store_true',
4458 default=False,
4459 help='Send the patchset to do a CQ quick run right after '
4460 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4461 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004462 parser.add_option('--set-bot-commit', action='store_true',
4463 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004464 parser.add_option('--preserve-tryjobs', action='store_true',
4465 help='instruct the CQ to let tryjobs running even after '
4466 'new patchsets are uploaded instead of canceling '
4467 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004468 parser.add_option('--dependencies', action='store_true',
4469 help='Uploads CLs of all the local branches that depend on '
4470 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004471 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4472 help='Sends your change to the CQ after an approval. Only '
4473 'works on repos that have the Auto-Submit label '
4474 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004475 parser.add_option('--parallel', action='store_true',
4476 help='Run all tests specified by input_api.RunTests in all '
4477 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004478 parser.add_option('--no-autocc', action='store_true',
4479 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004480 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004481 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004482 parser.add_option('-R', '--retry-failed', action='store_true',
4483 help='Retry failed tryjobs from old patchset immediately '
4484 'after uploading new patchset. Cannot be used with '
4485 '--use-commit-queue or --cq-dry-run.')
4486 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4487 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004488 parser.add_option('--fixed', '-x',
4489 help='List of bugs that will be commented on and marked '
4490 'fixed (pre-populates "Fixed:" tag). Same format as '
4491 '-b option / "Bug:" tag. If fixing several issues, '
4492 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004493 parser.add_option('--edit-description', action='store_true', default=False,
4494 help='Modify description before upload. Cannot be used '
4495 'with --force. It is a noop when --no-squash is set '
4496 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004497 parser.add_option('--git-completion-helper', action="store_true",
4498 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004499 parser.add_option('--resultdb', action='store_true',
4500 help='Run presubmit checks in the ResultSink environment '
4501 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004502 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004503 parser.add_option('-o',
4504 '--push-options',
4505 action='append',
4506 default=[],
4507 help='Transmit the given string to the server when '
4508 'performing git push (pass-through). See git-push '
4509 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004510 parser.add_option('--no-add-changeid',
4511 action='store_true',
4512 dest='no_add_changeid',
4513 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004514 parser.add_option('--no-python2-post-upload-hooks',
4515 action='store_true',
4516 help='Only run post-upload hooks in Python 3.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004517
rmistry@google.com2dd99862015-06-22 12:22:18 +00004518 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004519 (options, args) = parser.parse_args(args)
4520
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004521 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004522 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4523 if opt.help != optparse.SUPPRESS_HELP))
4524 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004525
sbc@chromium.org71437c02015-04-09 19:29:40 +00004526 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004527 return 1
4528
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004529 options.reviewers = cleanup_list(options.reviewers)
4530 options.cc = cleanup_list(options.cc)
4531
Josipe827b0f2020-01-30 00:07:20 +00004532 if options.edit_description and options.force:
4533 parser.error('Only one of --force and --edit-description allowed')
4534
tandriib80458a2016-06-23 12:20:07 -07004535 if options.message_file:
4536 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004537 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004538 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004539
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004540 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004541 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004542 options.use_commit_queue,
4543 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004544 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4545 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004546
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004547 if options.skip_title and options.title:
4548 parser.error('Only one of --title and --skip-title allowed.')
4549
Aaron Gableedbc4132017-09-11 13:22:28 -07004550 if options.use_commit_queue:
4551 options.send_mail = True
4552
Edward Lesmes0dd54822020-03-26 18:24:25 +00004553 if options.squash is None:
4554 # Load default for user, repo, squash=true, in this order.
4555 options.squash = settings.GetSquashGerritUploads()
4556
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004557 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004558 # Warm change details cache now to avoid RPCs later, reducing latency for
4559 # developers.
4560 if cl.GetIssue():
4561 cl._GetChangeDetail(
4562 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4563
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004564 if options.retry_failed and not cl.GetIssue():
4565 print('No previous patchsets, so --retry-failed has no effect.')
4566 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004567
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004568 # cl.GetMostRecentPatchset uses cached information, and can return the last
4569 # patchset before upload. Calling it here makes it clear that it's the
4570 # last patchset before upload. Note that GetMostRecentPatchset will fail
4571 # if no CL has been uploaded yet.
4572 if options.retry_failed:
4573 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004574
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004575 ret = cl.CMDUpload(options, args, orig_args)
4576
4577 if options.retry_failed:
4578 if ret != 0:
4579 print('Upload failed, so --retry-failed has no effect.')
4580 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004581 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004582 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004583 jobs = _filter_failed_for_retry(builds)
4584 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004585 print('No failed tryjobs, so --retry-failed has no effect.')
4586 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004587 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004588
4589 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004590
4591
Francois Dorayd42c6812017-05-30 15:10:20 -04004592@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004593@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004594def CMDsplit(parser, args):
4595 """Splits a branch into smaller branches and uploads CLs.
4596
4597 Creates a branch and uploads a CL for each group of files modified in the
4598 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004599 comment, the string '$directory', is replaced with the directory containing
4600 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004601 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004602 parser.add_option('-d', '--description', dest='description_file',
4603 help='A text file containing a CL description in which '
4604 '$directory will be replaced by each CL\'s directory.')
4605 parser.add_option('-c', '--comment', dest='comment_file',
4606 help='A text file containing a CL comment.')
4607 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004608 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004609 help='List the files and reviewers for each CL that would '
4610 'be created, but don\'t create branches or CLs.')
4611 parser.add_option('--cq-dry-run', action='store_true',
4612 help='If set, will do a cq dry run for each uploaded CL. '
4613 'Please be careful when doing this; more than ~10 CLs '
4614 'has the potential to overload our build '
4615 'infrastructure. Try to upload these not during high '
4616 'load times (usually 11-3 Mountain View time). Email '
4617 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004618 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4619 default=True,
4620 help='Sends your change to the CQ after an approval. Only '
4621 'works on repos that have the Auto-Submit label '
4622 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004623 parser.add_option('--max-depth',
4624 type='int',
4625 default=0,
4626 help='The max depth to look for OWNERS files. Useful for '
4627 'controlling the granularity of the split CLs, e.g. '
4628 '--max-depth=1 will only split by top-level '
4629 'directory. Specifying a value less than 1 means no '
4630 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004631 options, _ = parser.parse_args(args)
4632
4633 if not options.description_file:
4634 parser.error('No --description flag specified.')
4635
4636 def WrappedCMDupload(args):
4637 return CMDupload(OptionParser(), args)
4638
Daniel Cheng403c44e2022-10-05 22:24:58 +00004639 return split_cl.SplitCl(options.description_file, options.comment_file,
4640 Changelist, WrappedCMDupload, options.dry_run,
4641 options.cq_dry_run, options.enable_auto_submit,
4642 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004643
4644
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004645@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004646@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004648 """DEPRECATED: Used to commit the current changelist via git-svn."""
4649 message = ('git-cl no longer supports committing to SVN repositories via '
4650 'git-svn. You probably want to use `git cl land` instead.')
4651 print(message)
4652 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004653
4654
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004655@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004656@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004657def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004658 """Commits the current changelist via git.
4659
4660 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4661 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004662 """
4663 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4664 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004665 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004666 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004667 parser.add_option('--parallel', action='store_true',
4668 help='Run all tests specified by input_api.RunTests in all '
4669 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004670 parser.add_option('--resultdb', action='store_true',
4671 help='Run presubmit checks in the ResultSink environment '
4672 'and send results to the ResultDB database.')
4673 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004674 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004675
Edward Lemur934836a2019-09-09 20:16:54 +00004676 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004677
Robert Iannucci2e73d432018-03-14 01:10:47 -07004678 if not cl.GetIssue():
4679 DieWithError('You must upload the change first to Gerrit.\n'
4680 ' If you would rather have `git cl land` upload '
4681 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004682 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4683 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004684
4685
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004686@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004687@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004688def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004689 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004690 parser.add_option('-b', dest='newbranch',
4691 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004692 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004693 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004694 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004695 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004696
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004697 group = optparse.OptionGroup(
4698 parser,
4699 'Options for continuing work on the current issue uploaded from a '
4700 'different clone (e.g. different machine). Must be used independently '
4701 'from the other options. No issue number should be specified, and the '
4702 'branch must have an issue number associated with it')
4703 group.add_option('--reapply', action='store_true', dest='reapply',
4704 help='Reset the branch and reapply the issue.\n'
4705 'CAUTION: This will undo any local changes in this '
4706 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004707
4708 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004709 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004710 parser.add_option_group(group)
4711
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004712 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004713
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004714 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004715 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004716 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004717 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004718 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004719
Edward Lemur934836a2019-09-09 20:16:54 +00004720 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004721 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004722 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004723
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004724 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004725 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004726 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004727
4728 RunGit(['reset', '--hard', upstream])
4729 if options.pull:
4730 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004731
Edward Lemur678a6842019-10-03 22:25:05 +00004732 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004733 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4734 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004735
4736 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004737 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004738
Edward Lemurf38bc172019-09-03 21:02:13 +00004739 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004740 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004741 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004742
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004743 # We don't want uncommitted changes mixed up with the patch.
4744 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004745 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004746
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004747 if options.newbranch:
4748 if options.force:
4749 RunGit(['branch', '-D', options.newbranch],
4750 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004751 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004752
Edward Lemur678a6842019-10-03 22:25:05 +00004753 cl = Changelist(
4754 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004755
Edward Lemur678a6842019-10-03 22:25:05 +00004756 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004757 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004758
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004759 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4760 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004761
4762
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004763def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004764 """Fetches the tree status and returns either 'open', 'closed',
4765 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004766 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004767 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004768 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004769 if status.find('closed') != -1 or status == '0':
4770 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004771
4772 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004773 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004774
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004775 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004776 return 'unset'
4777
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004778
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004779def GetTreeStatusReason():
4780 """Fetches the tree status from a json url and returns the message
4781 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004782 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004783 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004784 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004785 status = json.loads(connection.read())
4786 connection.close()
4787 return status['message']
4788
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004789
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004790@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004791def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004792 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004793 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004794 status = GetTreeStatus()
4795 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004796 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797 return 2
4798
vapiera7fbd5a2016-06-16 09:17:49 -07004799 print('The tree is %s' % status)
4800 print()
4801 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004802 if status != 'open':
4803 return 1
4804 return 0
4805
4806
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004807@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004808def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004809 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4810 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004811 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004812 '-b', '--bot', action='append',
4813 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4814 'times to specify multiple builders. ex: '
4815 '"-b win_rel -b win_layout". See '
4816 'the try server waterfall for the builders name and the tests '
4817 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004818 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004819 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004820 help=('Buildbucket bucket to send the try requests. Format: '
4821 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004822 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004823 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004824 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004825 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004826 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004827 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004828 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004829 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004830 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004831 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004832 '-q',
4833 '--quick-run',
4834 action='store_true',
4835 default=False,
4836 help='trigger in quick run mode '
4837 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4838 'uick_run.md) (chromium only).')
4839 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004840 '--category', default='git_cl_try', help='Specify custom build category.')
4841 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004842 '--project',
4843 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004844 'in recipe to determine to which repository or directory to '
4845 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004846 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004847 '-p', '--property', dest='properties', action='append', default=[],
4848 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004849 'key2=value2 etc. The value will be treated as '
4850 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004851 'NOTE: using this may make your tryjob not usable for CQ, '
4852 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004853 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004854 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4855 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004856 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004857 parser.add_option(
4858 '-R', '--retry-failed', action='store_true', default=False,
4859 help='Retry failed jobs from the latest set of tryjobs. '
4860 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004861 parser.add_option(
4862 '-i', '--issue', type=int,
4863 help='Operate on this issue instead of the current branch\'s implicit '
4864 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004865 options, args = parser.parse_args(args)
4866
machenbach@chromium.org45453142015-09-15 08:45:22 +00004867 # Make sure that all properties are prop=value pairs.
4868 bad_params = [x for x in options.properties if '=' not in x]
4869 if bad_params:
4870 parser.error('Got properties with missing "=": %s' % bad_params)
4871
maruel@chromium.org15192402012-09-06 12:38:29 +00004872 if args:
4873 parser.error('Unknown arguments: %s' % args)
4874
Edward Lemur934836a2019-09-09 20:16:54 +00004875 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004876 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004877 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004878
Edward Lemurf38bc172019-09-03 21:02:13 +00004879 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004880 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004881
tandriie113dfd2016-10-11 10:20:12 -07004882 error_message = cl.CannotTriggerTryJobReason()
4883 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004884 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004885
Edward Lemur45768512020-03-02 19:03:14 +00004886 if options.bot:
4887 if options.retry_failed:
4888 parser.error('--bot is not compatible with --retry-failed.')
4889 if not options.bucket:
4890 parser.error('A bucket (e.g. "chromium/try") is required.')
4891
4892 triggered = [b for b in options.bot if 'triggered' in b]
4893 if triggered:
4894 parser.error(
4895 'Cannot schedule builds on triggered bots: %s.\n'
4896 'This type of bot requires an initial job from a parent (usually a '
4897 'builder). Schedule a job on the parent instead.\n' % triggered)
4898
4899 if options.bucket.startswith('.master'):
4900 parser.error('Buildbot masters are not supported.')
4901
4902 project, bucket = _parse_bucket(options.bucket)
4903 if project is None or bucket is None:
4904 parser.error('Invalid bucket: %s.' % options.bucket)
4905 jobs = sorted((project, bucket, bot) for bot in options.bot)
4906 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004907 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004908 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004909 if options.verbose:
4910 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004911 jobs = _filter_failed_for_retry(builds)
4912 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004913 print('There are no failed jobs in the latest set of jobs '
4914 '(patchset #%d), doing nothing.' % patchset)
4915 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004916 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004917 if num_builders > 10:
4918 confirm_or_exit('There are %d builders with failed builds.'
4919 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004920 elif options.quick_run:
4921 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4922 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004923 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004924 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004925 print('git cl try with no bots now defaults to CQ dry run.')
4926 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4927 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004928
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004929 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004930 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004931 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004932 except BuildbucketResponseException as ex:
4933 print('ERROR: %s' % ex)
4934 return 1
4935 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004936
4937
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004938@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004939def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004940 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004941 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004942 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004943 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004944 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004945 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004946 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004947 '--color', action='store_true', default=setup_color.IS_TTY,
4948 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004949 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004950 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4951 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004952 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004953 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004954 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004955 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004956 parser.add_option(
4957 '-i', '--issue', type=int,
4958 help='Operate on this issue instead of the current branch\'s implicit '
4959 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004960 options, args = parser.parse_args(args)
4961 if args:
4962 parser.error('Unrecognized args: %s' % ' '.join(args))
4963
Edward Lemur934836a2019-09-09 20:16:54 +00004964 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004965 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004966 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004967
tandrii221ab252016-10-06 08:12:04 -07004968 patchset = options.patchset
4969 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004970 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004971 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004972 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004973 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004974 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004975 cl.GetIssue())
4976
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004977 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004978 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004979 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004980 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004981 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004982 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004983 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004984 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004985 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004986 return 0
4987
4988
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004989@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004990@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004991def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004992 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004993 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004994 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004995 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004996
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004997 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004998 if args:
4999 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005000 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005001 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005002 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005003 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005004
5005 # Clear configured merge-base, if there is one.
5006 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005007 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005008 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005009 return 0
5010
5011
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005012@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005013def CMDweb(parser, args):
5014 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005015 parser.add_option('-p',
5016 '--print-only',
5017 action='store_true',
5018 dest='print_only',
5019 help='Only print the Gerrit URL, don\'t open it in the '
5020 'browser.')
5021 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005022 if args:
5023 parser.error('Unrecognized args: %s' % ' '.join(args))
5024
5025 issue_url = Changelist().GetIssueURL()
5026 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005027 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005028 return 1
5029
Orr Bernstein0b960582022-12-22 20:16:18 +00005030 if options.print_only:
5031 print(issue_url)
5032 return 0
5033
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005034 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005035 # allows us to hide the "Created new window in existing browser session."
5036 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005037 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005038 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005039 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005040 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005041 os.open(os.devnull, os.O_RDWR)
5042 try:
5043 webbrowser.open(issue_url)
5044 finally:
5045 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005046 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005047 return 0
5048
5049
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005050@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005051def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005052 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005053 parser.add_option('-d', '--dry-run', action='store_true',
5054 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005055 parser.add_option(
5056 '-q',
5057 '--quick-run',
5058 action='store_true',
5059 help='trigger in quick run mode '
5060 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5061 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005062 parser.add_option('-c', '--clear', action='store_true',
5063 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005064 parser.add_option(
5065 '-i', '--issue', type=int,
5066 help='Operate on this issue instead of the current branch\'s implicit '
5067 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005068 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005069 if args:
5070 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005071 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5072 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005073
Edward Lemur934836a2019-09-09 20:16:54 +00005074 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005075 if not cl.GetIssue():
5076 parser.error('Must upload the issue first.')
5077
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005078 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005079 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005080 elif options.quick_run:
5081 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005082 elif options.dry_run:
5083 state = _CQState.DRY_RUN
5084 else:
5085 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005086 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005087 return 0
5088
5089
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005090@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005091def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005092 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005093 parser.add_option(
5094 '-i', '--issue', type=int,
5095 help='Operate on this issue instead of the current branch\'s implicit '
5096 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005097 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005098 if args:
5099 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005100 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005101 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005102 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005103 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005104 cl.CloseIssue()
5105 return 0
5106
5107
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005108@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005109def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005110 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005111 parser.add_option(
5112 '--stat',
5113 action='store_true',
5114 dest='stat',
5115 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005116 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005117 if args:
5118 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005119
Edward Lemur934836a2019-09-09 20:16:54 +00005120 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005121 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005122 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005123 if not issue:
5124 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005125
Gavin Makbe2e9262022-11-08 23:41:55 +00005126 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005127 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005128 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005129 if not base:
5130 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5131 revision_info = detail['revisions'][detail['current_revision']]
5132 fetch_info = revision_info['fetch']['http']
5133 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5134 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005135
Aaron Gablea718c3e2017-08-28 17:47:28 -07005136 cmd = ['git', 'diff']
5137 if options.stat:
5138 cmd.append('--stat')
5139 cmd.append(base)
5140 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005141
5142 return 0
5143
5144
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005145@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005146def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005147 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005148 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005149 '--ignore-current',
5150 action='store_true',
5151 help='Ignore the CL\'s current reviewers and start from scratch.')
5152 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005153 '--ignore-self',
5154 action='store_true',
5155 help='Do not consider CL\'s author as an owners.')
5156 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005157 '--no-color',
5158 action='store_true',
5159 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005160 parser.add_option(
5161 '--batch',
5162 action='store_true',
5163 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005164 # TODO: Consider moving this to another command, since other
5165 # git-cl owners commands deal with owners for a given CL.
5166 parser.add_option(
5167 '--show-all',
5168 action='store_true',
5169 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005170 options, args = parser.parse_args(args)
5171
Edward Lemur934836a2019-09-09 20:16:54 +00005172 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005173 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005174
Yang Guo6e269a02019-06-26 11:17:02 +00005175 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005176 if len(args) == 0:
5177 print('No files specified for --show-all. Nothing to do.')
5178 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005179 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005180 for path in args:
5181 print('Owners for %s:' % path)
5182 print('\n'.join(
5183 ' - %s' % owner
5184 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005185 return 0
5186
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005187 if args:
5188 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005189 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005190 base_branch = args[0]
5191 else:
5192 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005193 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005194
Edward Lemur2c62b332020-03-12 22:12:33 +00005195 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005196
5197 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005198 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5199 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005200 return 0
5201
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005202 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005203 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005204 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005205 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005206 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005207 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005208 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005209
5210
Aiden Bennerc08566e2018-10-03 17:52:42 +00005211def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005212 """Generates a diff command."""
5213 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005214 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5215
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005216 if allow_prefix:
5217 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5218 # case that diff.noprefix is set in the user's git config.
5219 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5220 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005221 diff_cmd += ['--no-prefix']
5222
5223 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005224
5225 if args:
5226 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005227 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005228 diff_cmd.append(arg)
5229 else:
5230 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005231
5232 return diff_cmd
5233
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005234
Jamie Madill5e96ad12020-01-13 16:08:35 +00005235def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5236 """Runs clang-format-diff and sets a return value if necessary."""
5237
5238 if not clang_diff_files:
5239 return 0
5240
5241 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5242 # formatted. This is used to block during the presubmit.
5243 return_value = 0
5244
5245 # Locate the clang-format binary in the checkout
5246 try:
5247 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5248 except clang_format.NotFoundError as e:
5249 DieWithError(e)
5250
5251 if opts.full or settings.GetFormatFullByDefault():
5252 cmd = [clang_format_tool]
5253 if not opts.dry_run and not opts.diff:
5254 cmd.append('-i')
5255 if opts.dry_run:
5256 for diff_file in clang_diff_files:
5257 with open(diff_file, 'r') as myfile:
5258 code = myfile.read().replace('\r\n', '\n')
5259 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5260 stdout = stdout.replace('\r\n', '\n')
5261 if opts.diff:
5262 sys.stdout.write(stdout)
5263 if code != stdout:
5264 return_value = 2
5265 else:
5266 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5267 if opts.diff:
5268 sys.stdout.write(stdout)
5269 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005270 try:
5271 script = clang_format.FindClangFormatScriptInChromiumTree(
5272 'clang-format-diff.py')
5273 except clang_format.NotFoundError as e:
5274 DieWithError(e)
5275
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005276 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005277 if not opts.dry_run and not opts.diff:
5278 cmd.append('-i')
5279
5280 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005281 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005282
Edward Lesmes89624cd2020-04-06 17:51:56 +00005283 env = os.environ.copy()
5284 env['PATH'] = (
5285 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5286 stdout = RunCommand(
5287 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005288 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005289 if opts.diff:
5290 sys.stdout.write(stdout)
5291 if opts.dry_run and len(stdout) > 0:
5292 return_value = 2
5293
5294 return return_value
5295
5296
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005297def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5298 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5299 presubmit checks have failed (and returns 0 otherwise)."""
5300
5301 if not rust_diff_files:
5302 return 0
5303
5304 # Locate the rustfmt binary.
5305 try:
5306 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5307 except rustfmt.NotFoundError as e:
5308 DieWithError(e)
5309
5310 # TODO(crbug.com/1231317): Support formatting only the changed lines
5311 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5312 # https://github.com/emilio/rustfmt-format-diff
5313 cmd = [rustfmt_tool]
5314 if opts.dry_run:
5315 cmd.append('--check')
5316 cmd += rust_diff_files
5317 rustfmt_exitcode = subprocess2.call(cmd)
5318
5319 if opts.presubmit and rustfmt_exitcode != 0:
5320 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005321
5322 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005323
5324
Olivier Robin0a6b5442022-04-07 07:25:04 +00005325def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5326 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5327 that presubmit checks have failed (and returns 0 otherwise)."""
5328
5329 if not swift_diff_files:
5330 return 0
5331
5332 # Locate the swift-format binary.
5333 try:
5334 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5335 except swift_format.NotFoundError as e:
5336 DieWithError(e)
5337
5338 cmd = [swift_format_tool]
5339 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005340 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005341 else:
5342 cmd += ['format', '-i']
5343 cmd += swift_diff_files
5344 swift_format_exitcode = subprocess2.call(cmd)
5345
5346 if opts.presubmit and swift_format_exitcode != 0:
5347 return 2
5348
5349 return 0
5350
5351
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005352def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005353 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005354 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005355
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005356
enne@chromium.org555cfe42014-01-29 18:21:39 +00005357@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005358@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005359def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005360 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005361 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005362 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005363 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005364 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005365 parser.add_option('--full', action='store_true',
5366 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005367 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005368 parser.add_option('--dry-run', action='store_true',
5369 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005370 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005371 '--no-clang-format',
5372 dest='clang_format',
5373 action='store_false',
5374 default=True,
5375 help='Disables formatting of various file types using clang-format.')
5376 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005377 '--python',
5378 action='store_true',
5379 default=None,
5380 help='Enables python formatting on all python files.')
5381 parser.add_option(
5382 '--no-python',
5383 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005384 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005385 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005386 'If neither --python or --no-python are set, python files that have a '
5387 '.style.yapf file in an ancestor directory will be formatted. '
5388 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005389 parser.add_option(
5390 '--js',
5391 action='store_true',
5392 help='Format javascript code with clang-format. '
5393 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005394 parser.add_option('--diff', action='store_true',
5395 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005396 parser.add_option('--presubmit', action='store_true',
5397 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005398
5399 parser.add_option('--rust-fmt',
5400 dest='use_rust_fmt',
5401 action='store_true',
5402 default=rustfmt.IsRustfmtSupported(),
5403 help='Enables formatting of Rust file types using rustfmt.')
5404 parser.add_option(
5405 '--no-rust-fmt',
5406 dest='use_rust_fmt',
5407 action='store_false',
5408 help='Disables formatting of Rust file types using rustfmt.')
5409
Olivier Robin0a6b5442022-04-07 07:25:04 +00005410 parser.add_option(
5411 '--swift-format',
5412 dest='use_swift_format',
5413 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005414 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005415 help='Enables formatting of Swift file types using swift-format '
5416 '(macOS host only).')
5417 parser.add_option(
5418 '--no-swift-format',
5419 dest='use_swift_format',
5420 action='store_false',
5421 help='Disables formatting of Swift file types using swift-format.')
5422
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005423 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005424
Garrett Beaty91a6f332020-01-06 16:57:24 +00005425 if opts.python is not None and opts.no_python:
5426 raise parser.error('Cannot set both --python and --no-python')
5427 if opts.no_python:
5428 opts.python = False
5429
Daniel Chengc55eecf2016-12-30 03:11:02 -08005430 # Normalize any remaining args against the current path, so paths relative to
5431 # the current directory are still resolved as expected.
5432 args = [os.path.join(os.getcwd(), arg) for arg in args]
5433
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005434 # git diff generates paths against the root of the repository. Change
5435 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005436 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005437 if rel_base_path:
5438 os.chdir(rel_base_path)
5439
digit@chromium.org29e47272013-05-17 17:01:46 +00005440 # Grab the merge-base commit, i.e. the upstream commit of the current
5441 # branch when it was created or the last time it was rebased. This is
5442 # to cover the case where the user may have called "git fetch origin",
5443 # moving the origin branch to a newer commit, but hasn't rebased yet.
5444 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005445 upstream_branch = opts.upstream
5446 if not upstream_branch:
5447 cl = Changelist()
5448 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005449 if upstream_branch:
5450 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5451 upstream_commit = upstream_commit.strip()
5452
5453 if not upstream_commit:
5454 DieWithError('Could not find base commit for this branch. '
5455 'Are you in detached state?')
5456
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005457 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5458 diff_output = RunGit(changed_files_cmd)
5459 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005460 # Filter out files deleted by this CL
5461 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005462
Andreas Haas417d89c2020-02-06 10:24:27 +00005463 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005464 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005465
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005466 clang_diff_files = []
5467 if opts.clang_format:
5468 clang_diff_files = [
5469 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5470 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005471 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005472 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005473 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005474 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005475
Edward Lesmes50da7702020-03-30 19:23:43 +00005476 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005477
Jamie Madill5e96ad12020-01-13 16:08:35 +00005478 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5479 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005480
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005481 if opts.use_rust_fmt:
5482 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5483 upstream_commit)
5484 if rust_fmt_return_value == 2:
5485 return_value = 2
5486
Olivier Robin0a6b5442022-04-07 07:25:04 +00005487 if opts.use_swift_format:
5488 if sys.platform != 'darwin':
5489 DieWithError('swift-format is only supported on macOS.')
5490 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5491 upstream_commit)
5492 if swift_format_return_value == 2:
5493 return_value = 2
5494
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005495 # Similar code to above, but using yapf on .py files rather than clang-format
5496 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005497 py_explicitly_disabled = opts.python is not None and not opts.python
5498 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005499 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5500 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005501
Aiden Bennerc08566e2018-10-03 17:52:42 +00005502 # Used for caching.
5503 yapf_configs = {}
5504 for f in python_diff_files:
5505 # Find the yapf style config for the current file, defaults to depot
5506 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005507 _FindYapfConfigFile(f, yapf_configs, top_dir)
5508
5509 # Turn on python formatting by default if a yapf config is specified.
5510 # This breaks in the case of this repo though since the specified
5511 # style file is also the global default.
5512 if opts.python is None:
5513 filtered_py_files = []
5514 for f in python_diff_files:
5515 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5516 filtered_py_files.append(f)
5517 else:
5518 filtered_py_files = python_diff_files
5519
5520 # Note: yapf still seems to fix indentation of the entire file
5521 # even if line ranges are specified.
5522 # See https://github.com/google/yapf/issues/499
5523 if not opts.full and filtered_py_files:
5524 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5525
Brian Sheedyb4307d52019-12-02 19:18:17 +00005526 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5527 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5528 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005529
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005530 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005531 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5532 # Default to pep8 if not .style.yapf is found.
5533 if not yapf_style:
5534 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005535
Peter Wend9399922020-06-17 17:33:49 +00005536 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005537 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005538 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005539 else:
5540 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005541
5542 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005543
5544 has_formattable_lines = False
5545 if not opts.full:
5546 # Only run yapf over changed line ranges.
5547 for diff_start, diff_len in py_line_diffs[f]:
5548 diff_end = diff_start + diff_len - 1
5549 # Yapf errors out if diff_end < diff_start but this
5550 # is a valid line range diff for a removal.
5551 if diff_end >= diff_start:
5552 has_formattable_lines = True
5553 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5554 # If all line diffs were removals we have nothing to format.
5555 if not has_formattable_lines:
5556 continue
5557
5558 if opts.diff or opts.dry_run:
5559 cmd += ['--diff']
5560 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005561 stdout = RunCommand(cmd,
5562 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005563 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005564 cwd=top_dir,
5565 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005566 if opts.diff:
5567 sys.stdout.write(stdout)
5568 elif len(stdout) > 0:
5569 return_value = 2
5570 else:
5571 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005572 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005573
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005574 # Format GN build files. Always run on full build files for canonical form.
5575 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005576 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005577 if opts.dry_run or opts.diff:
5578 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005579 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005580 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005581 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005582 cwd=top_dir)
5583 if opts.dry_run and gn_ret == 2:
5584 return_value = 2 # Not formatted.
5585 elif opts.diff and gn_ret == 2:
5586 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005587 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005588 elif gn_ret != 0:
5589 # For non-dry run cases (and non-2 return values for dry-run), a
5590 # nonzero error code indicates a failure, probably because the file
5591 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005592 DieWithError('gn format failed on ' + gn_diff_file +
5593 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005594
Ilya Shermane081cbe2017-08-15 17:51:04 -07005595 # Skip the metrics formatting from the global presubmit hook. These files have
5596 # a separate presubmit hook that issues an error if the files need formatting,
5597 # whereas the top-level presubmit script merely issues a warning. Formatting
5598 # these files is somewhat slow, so it's important not to duplicate the work.
5599 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005600 for diff_xml in GetDiffXMLs(diff_files):
5601 xml_dir = GetMetricsDir(diff_xml)
5602 if not xml_dir:
5603 continue
5604
Ilya Shermane081cbe2017-08-15 17:51:04 -07005605 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005606 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005607 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005608
5609 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5610 # command as histograms/pretty_print.py now needs a relative path argument
5611 # after splitting the histograms into multiple directories.
5612 # For example, in tools/metrics/ukm, pretty-print could be run using:
5613 # $ python pretty_print.py
5614 # But in tools/metrics/histogrmas, pretty-print should be run with an
5615 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005616 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005617 # $ python pretty_print.py enums.xml
5618
Weilun Shib92c4b72020-08-27 17:45:11 +00005619 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005620 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005621 cmd.append(diff_xml)
5622
Ilya Shermane081cbe2017-08-15 17:51:04 -07005623 if opts.dry_run or opts.diff:
5624 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005625
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005626 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5627 # `shell` param and instead replace `'vpython'` with
5628 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005629 stdout = RunCommand(cmd,
5630 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005631 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005632 if opts.diff:
5633 sys.stdout.write(stdout)
5634 if opts.dry_run and stdout:
5635 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005636
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005637 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005638
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005639
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005640def GetDiffXMLs(diff_files):
5641 return [
5642 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5643 ]
5644
5645
5646def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005647 metrics_xml_dirs = [
5648 os.path.join('tools', 'metrics', 'actions'),
5649 os.path.join('tools', 'metrics', 'histograms'),
5650 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005651 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005652 os.path.join('tools', 'metrics', 'ukm'),
5653 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005654 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005655 if diff_xml.startswith(xml_dir):
5656 return xml_dir
5657 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005658
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005659
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005660@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005661@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005662def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005663 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005664 _, args = parser.parse_args(args)
5665
5666 if len(args) != 1:
5667 parser.print_help()
5668 return 1
5669
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005670 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005671 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005672 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005673
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005674 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005675
Edward Lemur52969c92020-02-06 18:15:28 +00005676 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005677 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005678 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005679
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005680 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005681 for key, issue in [x.split() for x in output.splitlines()]:
5682 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005683 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005684
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005685 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005686 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005687 return 1
5688 if len(branches) == 1:
5689 RunGit(['checkout', branches[0]])
5690 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005691 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005692 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005693 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005694 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005695 try:
5696 RunGit(['checkout', branches[int(which)]])
5697 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005698 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005699 return 1
5700
5701 return 0
5702
5703
maruel@chromium.org29404b52014-09-08 22:58:00 +00005704def CMDlol(parser, args):
5705 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005706 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005707 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5708 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5709 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005710 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005711 return 0
5712
5713
Josip Sokcevic0399e172022-03-21 23:11:51 +00005714def CMDversion(parser, args):
5715 import utils
5716 print(utils.depot_tools_version())
5717
5718
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005719class OptionParser(optparse.OptionParser):
5720 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005721
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005722 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005723 optparse.OptionParser.__init__(
5724 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005725 self.add_option(
5726 '-v', '--verbose', action='count', default=0,
5727 help='Use 2 times for more debugging info')
5728
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005729 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005730 try:
5731 return self._parse_args(args)
5732 finally:
5733 # Regardless of success or failure of args parsing, we want to report
5734 # metrics, but only after logging has been initialized (if parsing
5735 # succeeded).
5736 global settings
5737 settings = Settings()
5738
Edward Lesmes9c349062021-05-06 20:02:39 +00005739 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005740 # GetViewVCUrl ultimately calls logging method.
5741 project_url = settings.GetViewVCUrl().strip('/+')
5742 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5743 metrics.collector.add('project_urls', [project_url])
5744
5745 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005746 # Create an optparse.Values object that will store only the actual passed
5747 # options, without the defaults.
5748 actual_options = optparse.Values()
5749 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5750 # Create an optparse.Values object with the default options.
5751 options = optparse.Values(self.get_default_values().__dict__)
5752 # Update it with the options passed by the user.
5753 options._update_careful(actual_options.__dict__)
5754 # Store the options passed by the user in an _actual_options attribute.
5755 # We store only the keys, and not the values, since the values can contain
5756 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005757 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005758
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005759 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005760 logging.basicConfig(
5761 level=levels[min(options.verbose, len(levels) - 1)],
5762 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5763 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005764
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005765 return options, args
5766
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005767
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005768def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005769 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005770 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005771 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005772 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005773
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005774 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005775 dispatcher = subcommand.CommandDispatcher(__name__)
5776 try:
5777 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005778 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005779 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005780 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005781 if e.code != 500:
5782 raise
5783 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005784 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005785 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005786 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005787
5788
5789if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005790 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5791 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005792 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005793 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005794 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005795 sys.exit(main(sys.argv[1:]))