blob: 47c52df73ed7aca59375840f82a90d0685ce5b0c [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
Dirk Pranke6f0df682021-06-25 00:42:33 +0000810 def GetUsePython3(self):
811 return self._GetConfig('rietveld.use-python3')
812
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000813 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000814 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000815 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000816 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
817 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000818 # Default is squash now (http://crbug.com/611892#c23).
819 self.squash_gerrit_uploads = self._GetConfig(
820 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000821 return self.squash_gerrit_uploads
822
Edward Lesmes4de54132020-05-05 19:41:33 +0000823 def GetSquashGerritUploadsOverride(self):
824 """Return True or False if codereview.settings should be overridden.
825
826 Returns None if no override has been defined.
827 """
828 # See also http://crbug.com/611892#c23
829 result = self._GetConfig('gerrit.override-squash-uploads').lower()
830 if result == 'true':
831 return True
832 if result == 'false':
833 return False
834 return None
835
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000836 def GetIsGerrit(self):
837 """Return True if gerrit.host is set."""
838 if self.is_gerrit is None:
839 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
840 return self.is_gerrit
841
tandrii@chromium.org28253532016-04-14 13:46:56 +0000842 def GetGerritSkipEnsureAuthenticated(self):
843 """Return True if EnsureAuthenticated should not be done for Gerrit
844 uploads."""
845 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000846 self.gerrit_skip_ensure_authenticated = self._GetConfig(
847 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000848 return self.gerrit_skip_ensure_authenticated
849
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000850 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000851 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000852 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000853 # Git requires single quotes for paths with spaces. We need to replace
854 # them with double quotes for Windows to treat such paths as a single
855 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000856 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000857 return self.git_editor or None
858
thestig@chromium.org44202a22014-03-11 19:22:18 +0000859 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000860 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000861
862 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000863 return self._GetConfig(
864 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000865
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000866 def GetFormatFullByDefault(self):
867 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000868 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000869 result = (
870 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
871 error_ok=True).strip())
872 self.format_full_by_default = (result == 'true')
873 return self.format_full_by_default
874
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000875 def IsStatusCommitOrderByDate(self):
876 if self.is_status_commit_order_by_date is None:
877 result = (RunGit(['config', '--bool', 'cl.date-order'],
878 error_ok=True).strip())
879 self.is_status_commit_order_by_date = (result == 'true')
880 return self.is_status_commit_order_by_date
881
Edward Lemur26964072020-02-19 19:18:51 +0000882 def _GetConfig(self, key, default=''):
883 self._LazyUpdateIfNeeded()
884 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000885
886
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000887class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000888 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000889 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000890 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000891 DRY_RUN = 'dry_run'
892 COMMIT = 'commit'
893
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000894 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000895
896
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000897class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000898 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000899 self.issue = issue
900 self.patchset = patchset
901 self.hostname = hostname
902
903 @property
904 def valid(self):
905 return self.issue is not None
906
907
Edward Lemurf38bc172019-09-03 21:02:13 +0000908def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000909 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
910 fail_result = _ParsedIssueNumberArgument()
911
Edward Lemur678a6842019-10-03 22:25:05 +0000912 if isinstance(arg, int):
913 return _ParsedIssueNumberArgument(issue=arg)
914 if not isinstance(arg, basestring):
915 return fail_result
916
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000917 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000918 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700919
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000921 if not url.startswith('http'):
922 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000923 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
924 if url.startswith(short_url):
925 url = gerrit_url + url[len(short_url):]
926 break
927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000929 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000930 except ValueError:
931 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200932
Alex Turner30ae6372022-01-04 02:32:52 +0000933 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
934 # URL.
935 if not arg.startswith('http') and '.' not in parsed_url.netloc:
936 return fail_result
937
Edward Lemur678a6842019-10-03 22:25:05 +0000938 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
939 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
940 # Short urls like https://domain/<issue_number> can be used, but don't allow
941 # specifying the patchset (you'd 404), but we allow that here.
942 if parsed_url.path == '/':
943 part = parsed_url.fragment
944 else:
945 part = parsed_url.path
946
947 match = re.match(
948 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
949 if not match:
950 return fail_result
951
952 issue = int(match.group('issue'))
953 patchset = match.group('patchset')
954 return _ParsedIssueNumberArgument(
955 issue=issue,
956 patchset=int(patchset) if patchset else None,
957 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000958
959
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000960def _create_description_from_log(args):
961 """Pulls out the commit log to use as a base for the CL description."""
962 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000963 if len(args) == 1 and args[0] == None:
964 # Handle the case where None is passed as the branch.
965 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000966 if len(args) == 1 and not args[0].endswith('.'):
967 log_args = [args[0] + '..']
968 elif len(args) == 1 and args[0].endswith('...'):
969 log_args = [args[0][:-1]]
970 elif len(args) == 2:
971 log_args = [args[0] + '..' + args[1]]
972 else:
973 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000974 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975
976
Aaron Gablea45ee112016-11-22 15:14:38 -0800977class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700978 def __init__(self, issue, url):
979 self.issue = issue
980 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800981 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700982
983 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800984 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700985 self.issue, self.url)
986
987
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100988_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +0000989 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100990 # TODO(tandrii): these two aren't known in Gerrit.
991 'approval', 'disapproval'])
992
993
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000994class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000995 """Changelist works with one changelist in local branch.
996
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000997 Notes:
998 * Not safe for concurrent multi-{thread,process} use.
999 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001000 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001001 """
1002
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001003 def __init__(self,
1004 branchref=None,
1005 issue=None,
1006 codereview_host=None,
1007 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001008 """Create a new ChangeList instance.
1009
Edward Lemurf38bc172019-09-03 21:02:13 +00001010 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001013 global settings
1014 if not settings:
1015 # Happens when git_cl.py is used as a utility library.
1016 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001018 self.branchref = branchref
1019 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001020 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001021 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001022 else:
1023 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001024 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001026 self.lookedup_issue = False
1027 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001029 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001031 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001032 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001033 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001034 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001035
Edward Lemur125d60a2019-09-13 18:25:41 +00001036 # Lazily cached values.
1037 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1038 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001039 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001040 # Map from change number (issue) to its detail cache.
1041 self._detail_cache = {}
1042
1043 if codereview_host is not None:
1044 assert not codereview_host.startswith('https://'), codereview_host
1045 self._gerrit_host = codereview_host
1046 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001047
Edward Lesmese1576912021-02-16 21:53:34 +00001048 @property
1049 def owners_client(self):
1050 if self._owners_client is None:
1051 remote, remote_branch = self.GetRemoteBranch()
1052 branch = GetTargetRef(remote, remote_branch, None)
1053 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001054 host=self.GetGerritHost(),
1055 project=self.GetGerritProject(),
1056 branch=branch)
1057 return self._owners_client
1058
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001059 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001060 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001062 The return value is a string suitable for passing to git cl with the --cc
1063 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001064 """
1065 if self.cc is None:
Joanna Wang8c5174b2023-01-19 00:07:48 +00001066 self.cc = ','.join(filter(None, self.more_cc)) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001067 return self.cc
1068
Daniel Cheng7227d212017-11-17 08:12:37 -08001069 def ExtendCC(self, more_cc):
1070 """Extends the list of users to cc on this CL based on the changed files."""
1071 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001072
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001073 def GetCommitDate(self):
1074 """Returns the commit date as provided in the constructor"""
1075 return self.commit_date
1076
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001077 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001078 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001079 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001080 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001081 if not branchref:
1082 return None
1083 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001084 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 return self.branch
1086
1087 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001088 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 self.GetBranch() # Poke the lazy loader.
1090 return self.branchref
1091
Edward Lemur85153282020-02-14 22:06:29 +00001092 def _GitGetBranchConfigValue(self, key, default=None):
1093 return scm.GIT.GetBranchConfig(
1094 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001095
Edward Lemur85153282020-02-14 22:06:29 +00001096 def _GitSetBranchConfigValue(self, key, value):
1097 action = 'set %s to %r' % (key, value)
1098 if not value:
1099 action = 'unset %s' % key
1100 assert self.GetBranch(), 'a branch is needed to ' + action
1101 return scm.GIT.SetBranchConfig(
1102 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001103
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001104 @staticmethod
1105 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001106 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001107 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001109 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1110 settings.GetRoot(), branch)
1111 if not remote or not upstream_branch:
1112 DieWithError(
1113 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001114 'Verify this branch is set up to track another \n'
1115 '(via the --track argument to "git checkout -b ..."). \n'
1116 'or pass complete "git diff"-style arguments if supported, like\n'
1117 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001118
1119 return remote, upstream_branch
1120
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001121 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001122 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001123 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001124 DieWithError('The upstream for the current branch (%s) does not exist '
1125 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001126 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001127 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001128
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 def GetUpstreamBranch(self):
1130 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001132 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001133 upstream_branch = upstream_branch.replace('refs/heads/',
1134 'refs/remotes/%s/' % remote)
1135 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1136 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 self.upstream_branch = upstream_branch
1138 return self.upstream_branch
1139
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001140 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001141 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001142 remote, branch = None, self.GetBranch()
1143 seen_branches = set()
1144 while branch not in seen_branches:
1145 seen_branches.add(branch)
1146 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001147 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001148 if remote != '.' or branch.startswith('refs/remotes'):
1149 break
1150 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001151 remotes = RunGit(['remote'], error_ok=True).split()
1152 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001153 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001154 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001156 logging.warning('Could not determine which remote this change is '
1157 'associated with, so defaulting to "%s".' %
1158 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001159 else:
Gavin Make6a62332020-12-04 21:57:10 +00001160 logging.warning('Could not determine which remote this change is '
1161 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 branch = 'HEAD'
1163 if branch.startswith('refs/remotes'):
1164 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001165 elif branch.startswith('refs/branch-heads/'):
1166 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 else:
1168 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001169 return self._remote
1170
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001171 def GetRemoteUrl(self):
1172 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1173
1174 Returns None if there is no remote.
1175 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001176 is_cached, value = self._cached_remote_url
1177 if is_cached:
1178 return value
1179
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001181 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001182
Edward Lemur298f2cf2019-02-22 21:40:39 +00001183 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001184 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001185 if host:
1186 self._cached_remote_url = (True, url)
1187 return url
1188
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001189 # If it cannot be parsed as an url, assume it is a local directory,
1190 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001191 logging.warning('"%s" doesn\'t appear to point to a git host. '
1192 'Interpreting it as a local directory.', url)
1193 if not os.path.isdir(url):
1194 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001195 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1196 'but it doesn\'t exist.',
1197 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001198 return None
1199
1200 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001201 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001202
Edward Lemur79d4f992019-11-11 23:49:02 +00001203 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001204 if not host:
1205 logging.error(
1206 'Remote "%(remote)s" for branch "%(branch)s" points to '
1207 '"%(cache_path)s", but it is misconfigured.\n'
1208 '"%(cache_path)s" must be a git repo and must have a remote named '
1209 '"%(remote)s" pointing to the git host.', {
1210 'remote': remote,
1211 'cache_path': cache_path,
1212 'branch': self.GetBranch()})
1213 return None
1214
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001215 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001216 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001218 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001219 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001220 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001221 if self.GetBranch():
1222 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001223 if self.issue is not None:
1224 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001225 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001226 return self.issue
1227
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001228 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001229 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001230 issue = self.GetIssue()
1231 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001232 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001233 server = self.GetCodereviewServer()
1234 if short:
1235 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1236 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
Dirk Pranke6f0df682021-06-25 00:42:33 +00001238 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001239 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001240
Edward Lemur6c6827c2020-02-06 21:15:18 +00001241 def FetchDescription(self, pretty=False):
1242 assert self.GetIssue(), 'issue is required to query Gerrit'
1243
Edward Lemur9aa1a962020-02-25 00:58:38 +00001244 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001245 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1246 current_rev = data['current_revision']
1247 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001248
1249 if not pretty:
1250 return self.description
1251
1252 # Set width to 72 columns + 2 space indent.
1253 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1254 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1255 lines = self.description.splitlines()
1256 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257
1258 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001259 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001260 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001261 if self.GetBranch():
1262 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001263 if self.patchset is not None:
1264 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001265 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 return self.patchset
1267
Edward Lemur9aa1a962020-02-25 00:58:38 +00001268 def GetAuthor(self):
1269 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1270
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001272 """Set this branch's patchset. If patchset=0, clears the patchset."""
1273 assert self.GetBranch()
1274 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001275 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001276 else:
1277 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001278 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001279
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001280 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001281 """Set this branch's issue. If issue isn't given, clears the issue."""
1282 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001284 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001285 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001286 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001287 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001288 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001289 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001290 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 else:
tandrii5d48c322016-08-18 16:19:37 -07001292 # Reset all of these just to be clean.
1293 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001294 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001295 ISSUE_CONFIG_KEY,
1296 PATCHSET_CONFIG_KEY,
1297 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001298 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001299 ]
tandrii5d48c322016-08-18 16:19:37 -07001300 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001301 try:
1302 self._GitSetBranchConfigValue(prop, None)
1303 except subprocess2.CalledProcessError:
1304 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001305 msg = RunGit(['log', '-1', '--format=%B']).strip()
1306 if msg and git_footers.get_footer_change_id(msg):
1307 print('WARNING: The change patched into this branch has a Change-Id. '
1308 'Removing it.')
1309 RunGit(['commit', '--amend', '-m',
1310 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001311 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001312 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001313 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314
Edward Lemur2c62b332020-03-12 22:12:33 +00001315 def GetAffectedFiles(self, upstream):
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001316 try:
Edward Lemur2c62b332020-03-12 22:12:33 +00001317 return [f for _, f in scm.GIT.CaptureStatus(settings.GetRoot(), upstream)]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001318 except subprocess2.CalledProcessError:
1319 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001320 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001321 'This branch probably doesn\'t exist anymore. To reset the\n'
1322 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001323 ' git branch --set-upstream-to origin/main %s\n'
1324 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001325 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001326
dsansomee2d6fd92016-09-08 00:10:47 -07001327 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001328 assert self.GetIssue(), 'issue is required to update description'
1329
1330 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001331 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001332 if not force:
1333 confirm_or_exit(
1334 'The description cannot be modified while the issue has a pending '
1335 'unpublished edit. Either publish the edit in the Gerrit web UI '
1336 'or delete it.\n\n', action='delete the unpublished edit')
1337
1338 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001339 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001340 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001341 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001342 description, notify='NONE')
1343
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001344 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001345
Edward Lemur75526302020-02-27 22:31:05 +00001346 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001347 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001348 '--root', settings.GetRoot(),
1349 '--upstream', upstream,
1350 ]
1351
1352 args.extend(['--verbose'] * verbose)
1353
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001354 remote, remote_branch = self.GetRemoteBranch()
1355 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001356 if settings.GetIsGerrit():
1357 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1358 args.extend(['--gerrit_project', self.GetGerritProject()])
1359 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001360
Edward Lemur99df04e2020-03-05 19:39:43 +00001361 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001362 issue = self.GetIssue()
1363 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001364 if author:
1365 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001366 if issue:
1367 args.extend(['--issue', str(issue)])
1368 if patchset:
1369 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001370
Edward Lemur75526302020-02-27 22:31:05 +00001371 return args
1372
Josip Sokcevic017544d2022-03-31 23:47:53 +00001373 def RunHook(self,
1374 committing,
1375 may_prompt,
1376 verbose,
1377 parallel,
1378 upstream,
1379 description,
1380 all_files,
1381 files=None,
1382 resultdb=False,
1383 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001384 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1385 args = self._GetCommonPresubmitArgs(verbose, upstream)
1386 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001387 if may_prompt:
1388 args.append('--may_prompt')
1389 if parallel:
1390 args.append('--parallel')
1391 if all_files:
1392 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001393 if files:
1394 args.extend(files.split(';'))
1395 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001396 if files or all_files:
1397 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001398
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001399 if resultdb and not realm:
1400 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1401 # it is not required to pass the realm flag
1402 print('Note: ResultDB reporting will NOT be performed because --realm'
1403 ' was not specified. To enable ResultDB, please run the command'
1404 ' again with the --realm argument to specify the LUCI realm.')
1405
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001406 py3_results = self._RunPresubmit(args, resultdb, realm, description,
1407 use_python3=True)
Josip Sokcevic632bbc02022-05-19 05:32:50 +00001408 if py3_results.get('skipped_presubmits', 1) == 0:
1409 print('No more presubmits to run - skipping Python 2 presubmits.')
1410 return py3_results
1411
1412 py2_results = self._RunPresubmit(args, resultdb, realm, description,
1413 use_python3=False)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001414 return self._MergePresubmitResults(py2_results, py3_results)
1415
1416 def _RunPresubmit(self, args, resultdb, realm, description, use_python3):
1417 args = args[:]
1418 vpython = 'vpython3' if use_python3 else 'vpython'
1419
Edward Lemur227d5102020-02-25 23:45:35 +00001420 with gclient_utils.temporary_file() as description_file:
1421 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001422 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001423 args.extend(['--json_output', json_output])
1424 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001425 if self.GetUsePython3():
1426 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001427 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001428 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001429 if resultdb and realm:
1430 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001431
1432 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001433 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001434
Edward Lemur227d5102020-02-25 23:45:35 +00001435 metrics.collector.add_repeated('sub_commands', {
1436 'command': 'presubmit',
1437 'execution_time': time_time() - start,
1438 'exit_code': exit_code,
1439 })
1440
1441 if exit_code:
1442 sys.exit(exit_code)
1443
1444 json_results = gclient_utils.FileRead(json_output)
1445 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001446
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001447 def _MergePresubmitResults(self, py2_results, py3_results):
1448 return {
1449 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1450 py3_results.get('more_cc', []))),
1451 'errors': (
1452 py2_results.get('errors', []) + py3_results.get('errors', [])),
1453 'notifications': (
1454 py2_results.get('notifications', []) +
1455 py3_results.get('notifications', [])),
1456 'warnings': (
1457 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1458 }
1459
Brian Sheedy7326ca22022-11-02 18:36:17 +00001460 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001461 args = self._GetCommonPresubmitArgs(verbose, upstream)
1462 args.append('--post_upload')
1463
1464 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001465 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001466 args.extend(['--description_file', description_file])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001467 if not py3_only:
1468 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001469 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1470 ['--use-python3'])
Brian Sheedy7326ca22022-11-02 18:36:17 +00001471 if not py3_only:
1472 p_py2.wait()
Josip Sokcevice293d3d2022-02-16 22:52:15 +00001473 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001474
Edward Lemur5a644f82020-03-18 16:44:57 +00001475 def _GetDescriptionForUpload(self, options, git_diff_args, files):
1476 # Get description message for upload.
1477 if self.GetIssue():
1478 description = self.FetchDescription()
1479 elif options.message:
1480 description = options.message
1481 else:
1482 description = _create_description_from_log(git_diff_args)
1483 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001484 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001485
Edward Lemur5a644f82020-03-18 16:44:57 +00001486 bug = options.bug
1487 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001488 if not self.GetIssue():
1489 # Extract bug number from branch name, but only if issue is being created.
1490 # It must start with bug or fix, followed by _ or - and number.
1491 # Optionally, it may contain _ or - after number with arbitrary text.
1492 # Examples:
1493 # bug-123
1494 # bug_123
1495 # fix-123
1496 # fix-123-some-description
1497 match = re.match(
1498 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)',
1499 self.GetBranch())
1500 if not bug and not fixed and match:
1501 if match.group('type') == 'bug':
1502 bug = match.group('bugnum')
1503 else:
1504 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001505
1506 change_description = ChangeDescription(description, bug, fixed)
1507
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001508 # Fill gaps in OWNERS coverage to tbrs/reviewers if requested.
1509 if options.add_owners_to:
1510 assert options.add_owners_to in ('TBR', 'R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001511 status = self.owners_client.GetFilesApprovalStatus(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001512 files, [], options.tbrs + options.reviewers)
1513 missing_files = [
1514 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001515 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001516 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001517 owners = self.owners_client.SuggestOwners(
1518 missing_files, exclude=[self.GetAuthor()])
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001519 if options.add_owners_to == 'TBR':
1520 assert isinstance(options.tbrs, list), options.tbrs
1521 options.tbrs.extend(owners)
1522 else:
1523 assert isinstance(options.reviewers, list), options.reviewers
1524 options.reviewers.extend(owners)
1525
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 # Set the reviewer list now so that presubmit checks can access it.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001527 if options.reviewers or options.tbrs:
1528 change_description.update_reviewers(options.reviewers, options.tbrs)
Edward Lemur5a644f82020-03-18 16:44:57 +00001529
1530 return change_description
1531
1532 def _GetTitleForUpload(self, options):
manukh566e9d02022-06-30 19:49:53 +00001533 # When not squashing or options.title is provided, just return
1534 # options.title.
1535 if not options.squash or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001536 return options.title
1537
1538 # On first upload, patchset title is always this string, while options.title
1539 # gets converted to first line of message.
1540 if not self.GetIssue():
1541 return 'Initial upload'
1542
1543 # When uploading subsequent patchsets, options.message is taken as the title
1544 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001545 if options.message:
1546 return options.message.strip()
1547
1548 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001549 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001550 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001551 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001552 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001553
1554 # Use the default title if the user confirms the default with a 'y'.
1555 if user_title.lower() == 'y':
1556 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001557 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001558
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001559 def CMDUpload(self, options, git_diff_args, orig_args):
1560 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001561 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001563 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001564 else:
1565 if self.GetBranch() is None:
1566 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1567
1568 # Default to diffing against common ancestor of upstream branch
1569 base_branch = self.GetCommonAncestorWithUpstream()
1570 git_diff_args = [base_branch, 'HEAD']
1571
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001572 # Fast best-effort checks to abort before running potentially expensive
1573 # hooks if uploading is likely to fail anyway. Passing these checks does
1574 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001575 self.EnsureAuthenticated(force=options.force)
1576 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001577
1578 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001579 watchlist = watchlists.Watchlists(settings.GetRoot())
1580 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001581 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001582 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583
Edward Lemur5a644f82020-03-18 16:44:57 +00001584 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001585 if not options.bypass_hooks:
Edward Lemur2c62b332020-03-12 22:12:33 +00001586 hook_results = self.RunHook(
1587 committing=False,
1588 may_prompt=not options.force,
1589 verbose=options.verbose,
1590 parallel=options.parallel,
1591 upstream=base_branch,
Edward Lemur5a644f82020-03-18 16:44:57 +00001592 description=change_desc.description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001593 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001594 resultdb=options.resultdb,
1595 realm=options.realm)
Edward Lemur227d5102020-02-25 23:45:35 +00001596 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597
Aaron Gable13101a62018-02-09 13:20:41 -08001598 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001599 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001600 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 if not ret:
Edward Lemur85153282020-02-14 22:06:29 +00001602 self._GitSetBranchConfigValue(
Gavin Makbe2e9262022-11-08 23:41:55 +00001603 LAST_UPLOAD_HASH_CONFIG_KEY,
1604 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 # Run post upload hooks, if specified.
1606 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001607 self.RunPostUploadHook(options.verbose, base_branch,
1608 change_desc.description,
1609 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001610
1611 # Upload all dependencies if specified.
1612 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001613 print()
1614 print('--dependencies has been specified.')
1615 print('All dependent local branches will be re-uploaded.')
1616 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001617 # Remove the dependencies flag from args so that we do not end up in a
1618 # loop.
1619 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001620 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001621 return ret
1622
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001623 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001624 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001625
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001626 Issue must have been already uploaded and known. Optionally allows for
1627 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001628 """
1629 assert new_state in _CQState.ALL_STATES
1630 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001631 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001632 vote_map = {
1633 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001634 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001635 _CQState.DRY_RUN: 1,
1636 _CQState.COMMIT: 2,
1637 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001638 if new_state == _CQState.QUICK_RUN:
1639 labels = {
1640 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1641 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1642 }
1643 else:
1644 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001645 notify = False if new_state == _CQState.DRY_RUN else None
1646 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001647 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001648 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001649 return 0
1650 except KeyboardInterrupt:
1651 raise
1652 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001653 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001654 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001655 ' * Your project has no CQ,\n'
1656 ' * You don\'t have permission to change the CQ state,\n'
1657 ' * There\'s a bug in this code (see stack trace below).\n'
1658 'Consider specifying which bots to trigger manually or asking your '
1659 'project owners for permissions or contacting Chrome Infra at:\n'
1660 'https://www.chromium.org/infra\n\n' %
1661 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001662 # Still raise exception so that stack trace is printed.
1663 raise
1664
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001665 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001666 # Lazy load of configs.
1667 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001668 if self._gerrit_host and '.' not in self._gerrit_host:
1669 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1670 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001671 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001672 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001673 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001674 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001675 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1676 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001677 return self._gerrit_host
1678
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001679 def _GetGitHost(self):
1680 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001681 remote_url = self.GetRemoteUrl()
1682 if not remote_url:
1683 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001684 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001685
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001686 def GetCodereviewServer(self):
1687 if not self._gerrit_server:
1688 # If we're on a branch then get the server potentially associated
1689 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001690 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001691 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001692 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001693 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001694 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001695 if not self._gerrit_server:
1696 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1697 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001699 parts[0] = parts[0] + '-review'
1700 self._gerrit_host = '.'.join(parts)
1701 self._gerrit_server = 'https://%s' % self._gerrit_host
1702 return self._gerrit_server
1703
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001704 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001705 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001706 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001707 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001708 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001709 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001710 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001711 if project.endswith('.git'):
1712 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001713 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1714 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1715 # gitiles/git-over-https protocol. E.g.,
1716 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1717 # as
1718 # https://chromium.googlesource.com/v8/v8
1719 if project.startswith('a/'):
1720 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001721 return project
1722
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001723 def _GerritChangeIdentifier(self):
1724 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1725
1726 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001727 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001728 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001729 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001730 if project:
1731 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1732 # Fall back on still unique, but less efficient change number.
1733 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001734
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001735 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001736 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001737 if settings.GetGerritSkipEnsureAuthenticated():
1738 # For projects with unusual authentication schemes.
1739 # See http://crbug.com/603378.
1740 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001741
1742 # Check presence of cookies only if using cookies-based auth method.
1743 cookie_auth = gerrit_util.Authenticator.get()
1744 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001745 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001746
Florian Mayerae510e82020-01-30 21:04:48 +00001747 remote_url = self.GetRemoteUrl()
1748 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001749 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001750 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001751 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1752 logging.warning(
1753 'Ignoring branch %(branch)s with non-https/sso remote '
1754 '%(remote)s', {
1755 'branch': self.branch,
1756 'remote': self.GetRemoteUrl()
1757 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00001758 return
1759
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001760 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001761 self.GetCodereviewServer()
1762 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001763 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001764
1765 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1766 git_auth = cookie_auth.get_auth_header(git_host)
1767 if gerrit_auth and git_auth:
1768 if gerrit_auth == git_auth:
1769 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001770 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001771 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001772 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001773 ' %s\n'
1774 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001775 ' Consider running the following command:\n'
1776 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001777 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001778 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001779 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001780 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001781 cookie_auth.get_new_password_message(git_host)))
1782 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001783 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001784 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001785
1786 missing = (
1787 ([] if gerrit_auth else [self._gerrit_host]) +
1788 ([] if git_auth else [git_host]))
1789 DieWithError('Credentials for the following hosts are required:\n'
1790 ' %s\n'
1791 'These are read from %s (or legacy %s)\n'
1792 '%s' % (
1793 '\n '.join(missing),
1794 cookie_auth.get_gitcookies_path(),
1795 cookie_auth.get_netrc_path(),
1796 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001797
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001798 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001799 if not self.GetIssue():
1800 return
1801
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001802 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00001803 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00001804 DieWithError(
1805 'Change %s has been abandoned, new uploads are not allowed' %
1806 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00001807 if status == 'MERGED':
1808 answer = gclient_utils.AskForData(
1809 'Change %s has been submitted, new uploads are not allowed. '
1810 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
1811 ).lower()
1812 if answer not in ('y', ''):
1813 DieWithError('New uploads are not allowed.')
1814 self.SetIssue()
1815 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001816
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001817 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1818 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1819 # Apparently this check is not very important? Otherwise get_auth_email
1820 # could have been added to other implementations of Authenticator.
1821 cookies_auth = gerrit_util.Authenticator.get()
1822 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001823 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001824
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001825 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001826 if self.GetIssueOwner() == cookies_user:
1827 return
1828 logging.debug('change %s owner is %s, cookies user is %s',
1829 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001830 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001831 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001832 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001833 if details['email'] == self.GetIssueOwner():
1834 return
1835 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001836 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001837 'as %s.\n'
1838 'Uploading may fail due to lack of permissions.' %
1839 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1840 confirm_or_exit(action='upload')
1841
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001842 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001843 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001844 or CQ status, assuming adherence to a common workflow.
1845
1846 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001847 * 'error' - error from review tool (including deleted issues)
1848 * 'unsent' - no reviewers added
1849 * 'waiting' - waiting for review
1850 * 'reply' - waiting for uploader to reply to review
1851 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001852 * 'dry-run' - dry-running in the CQ
1853 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001854 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001855 """
1856 if not self.GetIssue():
1857 return None
1858
1859 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001860 data = self._GetChangeDetail([
1861 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001862 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001863 return 'error'
1864
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001865 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001866 return 'closed'
1867
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001868 cq_label = data['labels'].get('Commit-Queue', {})
1869 max_cq_vote = 0
1870 for vote in cq_label.get('all', []):
1871 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1872 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001873 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001874 if max_cq_vote == 1:
1875 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001876
Aaron Gable9ab38c62017-04-06 14:36:33 -07001877 if data['labels'].get('Code-Review', {}).get('approved'):
1878 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001879
1880 if not data.get('reviewers', {}).get('REVIEWER', []):
1881 return 'unsent'
1882
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001883 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001884 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001885 while messages:
1886 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00001887 if (m.get('tag', '').startswith('autogenerated:cq') or
1888 m.get('tag', '').startswith('autogenerated:cv')):
1889 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001890 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00001891 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001892 # Most recent message was by owner.
1893 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001894
1895 # Some reply from non-owner.
1896 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001897
1898 # Somehow there are no messages even though there are reviewers.
1899 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
Gavin Mak4e5e3992022-11-14 22:40:12 +00001901 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001902 if not self.GetIssue():
1903 return None
1904
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001905 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001906 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00001907 if update:
1908 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08001909 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001910
Gavin Makf35a9eb2022-11-17 18:34:36 +00001911 def _IsPatchsetRangeSignificant(self, lower, upper):
1912 """Returns True if the inclusive range of patchsets contains any reworks or
1913 rebases."""
1914 if not self.GetIssue():
1915 return False
1916
1917 data = self._GetChangeDetail(['ALL_REVISIONS'])
1918 ps_kind = {}
1919 for rev_info in data.get('revisions', {}).values():
1920 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
1921
1922 for ps in range(lower, upper + 1):
1923 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
1924 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
1925 return True
1926 return False
1927
Gavin Make61ccc52020-11-13 00:12:57 +00001928 def GetMostRecentDryRunPatchset(self):
1929 """Get patchsets equivalent to the most recent patchset and return
1930 the patchset with the latest dry run. If none have been dry run, return
1931 the latest patchset."""
1932 if not self.GetIssue():
1933 return None
1934
1935 data = self._GetChangeDetail(['ALL_REVISIONS'])
1936 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00001937 dry_run = {int(m['_revision_number'])
1938 for m in data.get('messages', [])
1939 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00001940
1941 for revision_info in sorted(data.get('revisions', {}).values(),
1942 key=lambda c: c['_number'], reverse=True):
1943 if revision_info['_number'] in dry_run:
1944 patchset = revision_info['_number']
1945 break
1946 if revision_info.get('kind', '') not in \
1947 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
1948 break
1949 self.SetPatchset(patchset)
1950 return patchset
1951
Aaron Gable636b13f2017-07-14 10:42:48 -07001952 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001953 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001954 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001955 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001956
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001957 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001958 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001959 # CURRENT_REVISION is included to get the latest patchset so that
1960 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001961 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001962 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1963 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001964 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001965 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001966 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001967 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001968
1969 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001970 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001971 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001972 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001973 line_comments = file_comments.setdefault(path, [])
1974 line_comments.extend(
1975 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001976
1977 # Build dictionary of file comments for easy access and sorting later.
1978 # {author+date: {path: {patchset: {line: url+message}}}}
1979 comments = collections.defaultdict(
1980 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00001981
1982 server = self.GetCodereviewServer()
1983 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
1984 # /c/ is automatically added by short URL server.
1985 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
1986 self.GetIssue())
1987 else:
1988 url_prefix = '%s/c/%s' % (server, self.GetIssue())
1989
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001990 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001991 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001992 tag = comment.get('tag', '')
1993 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001994 continue
1995 key = (comment['author']['email'], comment['updated'])
1996 if comment.get('side', 'REVISION') == 'PARENT':
1997 patchset = 'Base'
1998 else:
1999 patchset = 'PS%d' % comment['patch_set']
2000 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002001 url = ('%s/%s/%s#%s%s' %
2002 (url_prefix, comment['patch_set'], path,
2003 'b' if comment.get('side') == 'PARENT' else '',
2004 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002005 comments[key][path][patchset][line] = (url, comment['message'])
2006
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002007 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002008 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002009 summary = self._BuildCommentSummary(msg, comments, readable)
2010 if summary:
2011 summaries.append(summary)
2012 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002013
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002014 @staticmethod
2015 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002016 if 'email' not in msg['author']:
2017 # Some bot accounts may not have an email associated.
2018 return None
2019
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002020 key = (msg['author']['email'], msg['date'])
2021 # Don't bother showing autogenerated messages that don't have associated
2022 # file or line comments. this will filter out most autogenerated
2023 # messages, but will keep robot comments like those from Tricium.
2024 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2025 if is_autogenerated and not comments.get(key):
2026 return None
2027 message = msg['message']
2028 # Gerrit spits out nanoseconds.
2029 assert len(msg['date'].split('.')[-1]) == 9
2030 date = datetime.datetime.strptime(msg['date'][:-3],
2031 '%Y-%m-%d %H:%M:%S.%f')
2032 if key in comments:
2033 message += '\n'
2034 for path, patchsets in sorted(comments.get(key, {}).items()):
2035 if readable:
2036 message += '\n%s' % path
2037 for patchset, lines in sorted(patchsets.items()):
2038 for line, (url, content) in sorted(lines.items()):
2039 if line:
2040 line_str = 'Line %d' % line
2041 path_str = '%s:%d:' % (path, line)
2042 else:
2043 line_str = 'File comment'
2044 path_str = '%s:0:' % path
2045 if readable:
2046 message += '\n %s, %s: %s' % (patchset, line_str, url)
2047 message += '\n %s\n' % content
2048 else:
2049 message += '\n%s ' % path_str
2050 message += '\n%s\n' % content
2051
2052 return _CommentSummary(
2053 date=date,
2054 message=message,
2055 sender=msg['author']['email'],
2056 autogenerated=is_autogenerated,
2057 # These could be inferred from the text messages and correlated with
2058 # Code-Review label maximum, however this is not reliable.
2059 # Leaving as is until the need arises.
2060 approval=False,
2061 disapproval=False,
2062 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002063
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002064 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002065 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002066 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002067
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002068 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002069 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002070 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002071
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002072 def _GetChangeDetail(self, options=None):
2073 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002074 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002075 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002076
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002077 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002078 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002079 options.append('CURRENT_COMMIT')
2080
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002081 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002082 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002083 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002084
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002085 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2086 # Assumption: data fetched before with extra options is suitable
2087 # for return for a smaller set of options.
2088 # For example, if we cached data for
2089 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2090 # and request is for options=[CURRENT_REVISION],
2091 # THEN we can return prior cached data.
2092 if options_set.issubset(cached_options_set):
2093 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002094
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002095 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002096 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002097 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002098 except gerrit_util.GerritError as e:
2099 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002100 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002101 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002102
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002103 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002104 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002105
Gavin Mak4e5e3992022-11-14 22:40:12 +00002106 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002107 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002108 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002109 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2110 self._GerritChangeIdentifier(),
2111 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002112 except gerrit_util.GerritError as e:
2113 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002114 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002115 raise
agable32978d92016-11-01 12:55:02 -07002116 return data
2117
Karen Qian40c19422019-03-13 21:28:29 +00002118 def _IsCqConfigured(self):
2119 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002120 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002121
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002122 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002123 if git_common.is_dirty_git_tree('land'):
2124 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002125
tandriid60367b2016-06-22 05:25:12 -07002126 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002127 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002128 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002129 'which can test and land changes for you. '
2130 'Are you sure you wish to bypass it?\n',
2131 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002132 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002133 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002134 # Note: git diff outputs nothing if there is no diff.
2135 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002136 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002137 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002138 if detail['current_revision'] == last_upload:
2139 differs = False
2140 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002141 print('WARNING: Local branch contents differ from latest uploaded '
2142 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002143 if differs:
2144 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002145 confirm_or_exit(
2146 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2147 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002148 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002149 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002150 upstream = self.GetCommonAncestorWithUpstream()
2151 if self.GetIssue():
2152 description = self.FetchDescription()
2153 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002154 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002155 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002156 committing=True,
2157 may_prompt=not force,
2158 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002159 parallel=parallel,
2160 upstream=upstream,
2161 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002162 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002163 resultdb=resultdb,
2164 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002165
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002166 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002167 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002168 links = self._GetChangeCommit().get('web_links', [])
2169 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002170 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002171 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002172 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002173 return 0
2174
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002175 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2176 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002177 assert parsed_issue_arg.valid
2178
Edward Lemur125d60a2019-09-13 18:25:41 +00002179 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180
2181 if parsed_issue_arg.hostname:
2182 self._gerrit_host = parsed_issue_arg.hostname
2183 self._gerrit_server = 'https://%s' % self._gerrit_host
2184
tandriic2405f52016-10-10 08:13:15 -07002185 try:
2186 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002187 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002188 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002189
2190 if not parsed_issue_arg.patchset:
2191 # Use current revision by default.
2192 revision_info = detail['revisions'][detail['current_revision']]
2193 patchset = int(revision_info['_number'])
2194 else:
2195 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002196 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2198 break
2199 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002200 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 (parsed_issue_arg.patchset, self.GetIssue()))
2202
Edward Lemur125d60a2019-09-13 18:25:41 +00002203 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002204 if remote_url.endswith('.git'):
2205 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002206 remote_url = remote_url.rstrip('/')
2207
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002208 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002209 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002210
2211 if remote_url != fetch_info['url']:
2212 DieWithError('Trying to patch a change from %s but this repo appears '
2213 'to be %s.' % (fetch_info['url'], remote_url))
2214
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002215 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002216
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002217 # If we have created a new branch then do the "set issue" immediately in
2218 # case the cherry-pick fails, which happens when resolving conflicts.
2219 if newbranch:
2220 self.SetIssue(parsed_issue_arg.issue)
2221
Aaron Gable62619a32017-06-16 08:22:09 -07002222 if force:
2223 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2224 print('Checked out commit for change %i patchset %i locally' %
2225 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002226 elif nocommit:
2227 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2228 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002229 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002230 RunGit(['cherry-pick', 'FETCH_HEAD'])
2231 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002232 (parsed_issue_arg.issue, patchset))
2233 print('Note: this created a local commit which does not have '
2234 'the same hash as the one uploaded for review. This will make '
2235 'uploading changes based on top of this branch difficult.\n'
2236 'If you want to do that, use "git cl patch --force" instead.')
2237
Stefan Zagerd08043c2017-10-12 12:07:02 -07002238 if self.GetBranch():
2239 self.SetIssue(parsed_issue_arg.issue)
2240 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002241 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002242 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2243 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002244 else:
2245 print('WARNING: You are in detached HEAD state.\n'
2246 'The patch has been applied to your checkout, but you will not be '
2247 'able to upload a new patch set to the gerrit issue.\n'
2248 'Try using the \'-b\' option if you would like to work on a '
2249 'branch and/or upload a new patch set.')
2250
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002251 return 0
2252
tandrii16e0b4e2016-06-07 10:34:28 -07002253 def _GerritCommitMsgHookCheck(self, offer_removal):
2254 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2255 if not os.path.exists(hook):
2256 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002257 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2258 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002259 data = gclient_utils.FileRead(hook)
2260 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2261 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002262 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002263 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002264 'and may interfere with it in subtle ways.\n'
2265 'We recommend you remove the commit-msg hook.')
2266 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002267 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002268 gclient_utils.rm_file_or_tree(hook)
2269 print('Gerrit commit-msg hook removed.')
2270 else:
2271 print('OK, will keep Gerrit commit-msg hook in place.')
2272
Edward Lemur1b52d872019-05-09 21:12:12 +00002273 def _CleanUpOldTraces(self):
2274 """Keep only the last |MAX_TRACES| traces."""
2275 try:
2276 traces = sorted([
2277 os.path.join(TRACES_DIR, f)
2278 for f in os.listdir(TRACES_DIR)
2279 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2280 and not f.startswith('tmp'))
2281 ])
2282 traces_to_delete = traces[:-MAX_TRACES]
2283 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002284 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002285 except OSError:
2286 print('WARNING: Failed to remove old git traces from\n'
2287 ' %s'
2288 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002289
Edward Lemur5737f022019-05-17 01:24:00 +00002290 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002291 """Zip and write the git push traces stored in traces_dir."""
2292 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002293 traces_zip = trace_name + '-traces'
2294 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002295 # Create a temporary dir to store git config and gitcookies in. It will be
2296 # compressed and stored next to the traces.
2297 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002298 git_info_zip = trace_name + '-git-info'
2299
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002300 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002301
Edward Lemur1b52d872019-05-09 21:12:12 +00002302 git_push_metadata['trace_name'] = trace_name
2303 gclient_utils.FileWrite(
2304 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2305
2306 # Keep only the first 6 characters of the git hashes on the packet
2307 # trace. This greatly decreases size after compression.
2308 packet_traces = os.path.join(traces_dir, 'trace-packet')
2309 if os.path.isfile(packet_traces):
2310 contents = gclient_utils.FileRead(packet_traces)
2311 gclient_utils.FileWrite(
2312 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2313 shutil.make_archive(traces_zip, 'zip', traces_dir)
2314
2315 # Collect and compress the git config and gitcookies.
2316 git_config = RunGit(['config', '-l'])
2317 gclient_utils.FileWrite(
2318 os.path.join(git_info_dir, 'git-config'),
2319 git_config)
2320
2321 cookie_auth = gerrit_util.Authenticator.get()
2322 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2323 gitcookies_path = cookie_auth.get_gitcookies_path()
2324 if os.path.isfile(gitcookies_path):
2325 gitcookies = gclient_utils.FileRead(gitcookies_path)
2326 gclient_utils.FileWrite(
2327 os.path.join(git_info_dir, 'gitcookies'),
2328 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2329 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2330
Edward Lemur1b52d872019-05-09 21:12:12 +00002331 gclient_utils.rmtree(git_info_dir)
2332
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002333 def _RunGitPushWithTraces(self,
2334 refspec,
2335 refspec_opts,
2336 git_push_metadata,
2337 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002338 """Run git push and collect the traces resulting from the execution."""
2339 # Create a temporary directory to store traces in. Traces will be compressed
2340 # and stored in a 'traces' dir inside depot_tools.
2341 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002342 trace_name = os.path.join(
2343 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002344
2345 env = os.environ.copy()
2346 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2347 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002348 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002349 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2350 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2351 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2352
2353 try:
2354 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002355 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002356 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002357 push_cmd = ['git', 'push', remote_url, refspec]
2358 if git_push_options:
2359 for opt in git_push_options:
2360 push_cmd.extend(['-o', opt])
2361
Edward Lemur0f58ae42019-04-30 17:24:12 +00002362 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002363 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002364 env=env,
2365 print_stdout=True,
2366 # Flush after every line: useful for seeing progress when running as
2367 # recipe.
2368 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002369 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002370 except subprocess2.CalledProcessError as e:
2371 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002372 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002373 raise GitPushError(
2374 'Failed to create a change, very likely due to blocked keyword. '
2375 'Please examine output above for the reason of the failure.\n'
2376 'If this is a false positive, you can try to bypass blocked '
2377 'keyword by using push option '
2378 '-o uploadvalidator~skip, e.g.:\n'
2379 'git cl upload -o uploadvalidator~skip\n\n'
2380 'If git-cl is not working correctly, file a bug under the '
2381 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002382 if 'git push -o nokeycheck' in str(e.stdout):
2383 raise GitPushError(
2384 'Failed to create a change, very likely due to a private key being '
2385 'detected. Please examine output above for the reason of the '
2386 'failure.\n'
2387 'If this is a false positive, you can try to bypass private key '
2388 'detection by using push option '
2389 '-o nokeycheck, e.g.:\n'
2390 'git cl upload -o nokeycheck\n\n'
2391 'If git-cl is not working correctly, file a bug under the '
2392 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002393
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002394 raise GitPushError(
2395 'Failed to create a change. Please examine output above for the '
2396 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002397 'For emergencies, Googlers can escalate to '
2398 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002399 'Hint: run command below to diagnose common Git/Gerrit '
2400 'credential problems:\n'
2401 ' git cl creds-check\n'
2402 '\n'
2403 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2404 'component including the files below.\n'
2405 'Review the files before upload, since they might contain sensitive '
2406 'information.\n'
2407 'Set the Restrict-View-Google label so that they are not publicly '
2408 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002409 finally:
2410 execution_time = time_time() - before_push
2411 metrics.collector.add_repeated('sub_commands', {
2412 'command': 'git push',
2413 'execution_time': execution_time,
2414 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002415 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002416 })
2417
Edward Lemur1b52d872019-05-09 21:12:12 +00002418 git_push_metadata['execution_time'] = execution_time
2419 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002420 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002421
Edward Lemur1b52d872019-05-09 21:12:12 +00002422 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002423 gclient_utils.rmtree(traces_dir)
2424
2425 return push_stdout
2426
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002427 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2428 change_desc):
2429 """Upload the current branch to Gerrit, retry if new remote HEAD is
2430 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002431 remote, remote_branch = self.GetRemoteBranch()
2432 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2433
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002434 try:
2435 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002436 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002437 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002438 # Repository might be in the middle of transition to main branch as
2439 # default, and uploads to old default might be blocked.
2440 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002441 DieWithError(str(e), change_desc)
2442
Josip Sokcevicb631a882021-01-06 18:18:10 +00002443 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2444 self.GetGerritProject())
2445 if project_head == branch:
2446 DieWithError(str(e), change_desc)
2447 branch = project_head
2448
2449 print("WARNING: Fetching remote state and retrying upload to default "
2450 "branch...")
2451 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002452 options.edit_description = False
2453 options.force = True
2454 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002455 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2456 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002457 except GitPushError as e:
2458 DieWithError(str(e), change_desc)
2459
2460 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002461 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002462 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002463 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002464 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002465 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002466 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002467 # User requested to change description
2468 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002469 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002470 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2471 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002472 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002473
2474 # Check if changes outside of this workspace have been uploaded.
2475 current_rev = change_detail['current_revision']
2476 last_uploaded_rev = self._GitGetBranchConfigValue(
2477 GERRIT_SQUASH_HASH_CONFIG_KEY)
2478 if last_uploaded_rev and current_rev != last_uploaded_rev:
2479 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002480 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002481 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002482 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002483 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002484 if len(change_ids) == 1:
2485 change_id = change_ids[0]
2486 else:
2487 change_id = GenerateGerritChangeId(change_desc.description)
2488 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002489
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002490 if options.preserve_tryjobs:
2491 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002492
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002493 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002494 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002495 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002496 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002497 with gclient_utils.temporary_file() as desc_tempfile:
2498 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2499 ref_to_push = RunGit(
2500 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002501 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002502 if options.no_add_changeid:
2503 pass
2504 else: # adding Change-Ids is okay.
2505 if not git_footers.get_footer_change_id(change_desc.description):
2506 DownloadGerritHook(False)
2507 change_desc.set_description(
2508 self._AddChangeIdToCommitMessage(change_desc.description,
2509 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002510 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002511 # For no-squash mode, we assume the remote called "origin" is the one we
2512 # want. It is not worthwhile to support different workflows for
2513 # no-squash mode.
2514 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002515 # attempt to extract the changeid from the current description
2516 # fail informatively if not possible.
2517 change_id_candidates = git_footers.get_footer_change_id(
2518 change_desc.description)
2519 if not change_id_candidates:
2520 DieWithError("Unable to extract change-id from message.")
2521 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002522
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002523 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002524 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2525 ref_to_push)]).splitlines()
2526 if len(commits) > 1:
2527 print('WARNING: This will upload %d commits. Run the following command '
2528 'to see which commits will be uploaded: ' % len(commits))
2529 print('git log %s..%s' % (parent, ref_to_push))
2530 print('You can also use `git squash-branch` to squash these into a '
2531 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002532 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002533
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002534 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002535 cc = []
Joanna Wang8c5174b2023-01-19 00:07:48 +00002536 # Add CCs from WATCHLISTS and git config unless this is
Edward Lemur4508b422019-10-03 21:56:35 +00002537 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2538 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002539 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002540 if len(cc) > 100:
2541 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2542 'process/lsc/lsc_workflow.md')
2543 print('WARNING: This will auto-CC %s users.' % len(cc))
2544 print('LSC may be more appropriate: %s' % lsc)
2545 print('You can also use the --no-autocc flag to disable auto-CC.')
2546 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002547 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002548 if options.cc:
2549 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002550 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002551 if change_desc.get_cced():
2552 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002553 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002554 valid_accounts = set(reviewers + cc)
2555 # TODO(crbug/877717): relax this for all hosts.
2556 else:
2557 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002558 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002559 logging.info('accounts %s are recognized, %s invalid',
2560 sorted(valid_accounts),
2561 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002562
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002563 # Extra options that can be specified at push time. Doc:
2564 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002565 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002566
Aaron Gable844cf292017-06-28 11:32:59 -07002567 # By default, new changes are started in WIP mode, and subsequent patchsets
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002568 # don't send email. At any time, passing --send-mail or --send-email will
2569 # mark the change ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002570 if options.send_mail:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002571 refspec_opts.append('ready')
2572 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002573 elif not self.GetIssue() and options.squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002574 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002575 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002576 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002577
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002578 # TODO(tandrii): options.message should be posted as a comment if
2579 # --send-mail or --send-email is set on non-initial upload as Rietveld used
2580 # to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002581
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002582 # Set options.title in case user was prompted in _GetTitleForUpload and
2583 # _CMDUploadChange needs to be called again.
2584 options.title = self._GetTitleForUpload(options)
2585 if options.title:
Nick Carter8692b182017-11-06 16:30:38 -08002586 # Punctuation and whitespace in |title| must be percent-encoded.
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002587 refspec_opts.append(
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002588 'm=' + gerrit_util.PercentEncodeForGitRef(options.title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002589
agablec6787972016-09-09 16:13:34 -07002590 if options.private:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002591 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002592
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002593 for r in sorted(reviewers):
2594 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002595 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002596 reviewers.remove(r)
2597 else:
2598 # TODO(tandrii): this should probably be a hard failure.
2599 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2600 % r)
2601 for c in sorted(cc):
2602 # refspec option will be rejected if cc doesn't correspond to an
2603 # account, even though REST call to add such arbitrary cc may succeed.
2604 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002605 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002606 cc.remove(c)
2607
rmistry9eadede2016-09-19 11:22:43 -07002608 if options.topic:
2609 # Documentation on Gerrit topics is here:
2610 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002611 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002612
Edward Lemur687ca902018-12-05 02:30:30 +00002613 if options.enable_auto_submit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002614 refspec_opts.append('l=Auto-Submit+1')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00002615 if options.set_bot_commit:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002616 refspec_opts.append('l=Bot-Commit+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002617 if options.use_commit_queue:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002618 refspec_opts.append('l=Commit-Queue+2')
Edward Lemur687ca902018-12-05 02:30:30 +00002619 elif options.cq_dry_run:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002620 refspec_opts.append('l=Commit-Queue+1')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00002621 elif options.cq_quick_run:
2622 refspec_opts.append('l=Commit-Queue+1')
2623 refspec_opts.append('l=Quick-Run+1')
Edward Lemur687ca902018-12-05 02:30:30 +00002624
2625 if change_desc.get_reviewers(tbr_only=True):
2626 score = gerrit_util.GetCodeReviewTbrScore(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002627 self.GetGerritHost(),
2628 self.GetGerritProject())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002629 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002630
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002631 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002632 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002633 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002634 hashtags.update(change_desc.get_hash_tags())
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002635 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2636
2637 refspec_suffix = ''
2638 if refspec_opts:
2639 refspec_suffix = '%' + ','.join(refspec_opts)
2640 assert ' ' not in refspec_suffix, (
2641 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2642 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002643
Edward Lemur1b52d872019-05-09 21:12:12 +00002644 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002645 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002646 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002647 'change_id': change_id,
2648 'description': change_desc.description,
2649 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002650
Gavin Mak4e5e3992022-11-14 22:40:12 +00002651 # Gerrit may or may not update fast enough to return the correct patchset
2652 # number after we push. Get the pre-upload patchset and increment later.
2653 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2654
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002655 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002656 git_push_metadata,
2657 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002658
2659 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002660 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002661 change_numbers = [m.group(1)
2662 for m in map(regex.match, push_stdout.splitlines())
2663 if m]
2664 if len(change_numbers) != 1:
2665 DieWithError(
2666 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002667 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002668 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002669 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002670 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002671
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002672 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002673 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002674 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002675 gerrit_util.AddReviewers(self.GetGerritHost(),
2676 self._GerritChangeIdentifier(),
2677 reviewers,
2678 cc,
2679 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002680
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002681 return 0
2682
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002683 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2684 change_desc):
2685 """Computes parent of the generated commit to be uploaded to Gerrit.
2686
2687 Returns revision or a ref name.
2688 """
2689 if custom_cl_base:
2690 # Try to avoid creating additional unintended CLs when uploading, unless
2691 # user wants to take this risk.
2692 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2693 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2694 local_ref_of_target_remote])
2695 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002696 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002697 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2698 'If you proceed with upload, more than 1 CL may be created by '
2699 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2700 'If you are certain that specified base `%s` has already been '
2701 'uploaded to Gerrit as another CL, you may proceed.\n' %
2702 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2703 if not force:
2704 confirm_or_exit(
2705 'Do you take responsibility for cleaning up potential mess '
2706 'resulting from proceeding with upload?',
2707 action='upload')
2708 return custom_cl_base
2709
Aaron Gablef97e33d2017-03-30 15:44:27 -07002710 if remote != '.':
2711 return self.GetCommonAncestorWithUpstream()
2712
2713 # If our upstream branch is local, we base our squashed commit on its
2714 # squashed version.
2715 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2716
Aaron Gablef97e33d2017-03-30 15:44:27 -07002717 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002718 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002719 if upstream_branch_name == 'main':
2720 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002721
2722 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002723 # TODO(tandrii): consider checking parent change in Gerrit and using its
2724 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2725 # the tree hash of the parent branch. The upside is less likely bogus
2726 # requests to reupload parent change just because it's uploadhash is
2727 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002728 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2729 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002730 # Verify that the upstream branch has been uploaded too, otherwise
2731 # Gerrit will create additional CLs when uploading.
2732 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2733 RunGitSilent(['rev-parse', parent + ':'])):
2734 DieWithError(
2735 '\nUpload upstream branch %s first.\n'
2736 'It is likely that this branch has been rebased since its last '
2737 'upload, so you just need to upload it again.\n'
2738 '(If you uploaded it with --no-squash, then branch dependencies '
2739 'are not supported, and you should reupload with --squash.)'
2740 % upstream_branch_name,
2741 change_desc)
2742 return parent
2743
Gavin Mak4e5e3992022-11-14 22:40:12 +00002744 def _UpdateWithExternalChanges(self):
2745 """Updates workspace with external changes.
2746
2747 Returns the commit hash that should be used as the merge base on upload.
2748 """
2749 local_ps = self.GetPatchset()
2750 if local_ps is None:
2751 return
2752
2753 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002754 if external_ps is None or local_ps == external_ps or \
2755 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002756 return
2757
2758 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002759 if num_changes > 1:
2760 change_words = 'changes were'
2761 else:
2762 change_words = 'change was'
2763 print('\n%d external %s published to %s:\n' %
2764 (num_changes, change_words, self.GetIssueURL(short=True)))
2765
2766 # Print an overview of external changes.
2767 ps_to_commit = {}
2768 ps_to_info = {}
2769 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2770 for commit_id, revision_info in revisions.get('revisions', {}).items():
2771 ps_num = revision_info['_number']
2772 ps_to_commit[ps_num] = commit_id
2773 ps_to_info[ps_num] = revision_info
2774
2775 for ps in range(external_ps, local_ps, -1):
2776 commit = ps_to_commit[ps][:8]
2777 desc = ps_to_info[ps].get('description', '')
2778 print('Patchset %d [%s] %s' % (ps, commit, desc))
2779
2780 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2781 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002782 return
2783
2784 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2785 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2786 external_base = external_parent['commit']
2787
2788 branch = git_common.current_branch()
2789 local_base = self.GetCommonAncestorWithUpstream()
2790 if local_base != external_base:
2791 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2792 (local_base, external_base))
2793 if git_common.upstream(branch):
2794 DieWithError('Upstream branch set. Consider using `git rebase-update` '
2795 'to make these the same.')
2796 print('No upstream branch set. Consider setting it and using '
2797 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
2798
2799 # Fetch Gerrit's CL base if it doesn't exist locally.
2800 remote, _ = self.GetRemoteBranch()
2801 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2802 RunGitSilent(['fetch', remote, external_base])
2803
2804 # Get the diff between local_ps and external_ps.
2805 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00002806 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002807 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
2808 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2809 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
2810 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
2811 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
2812
2813 # Diff can be empty in the case of trivial rebases.
2814 if not diff:
2815 return external_base
2816
2817 # Apply the diff.
2818 with gclient_utils.temporary_file() as diff_tempfile:
2819 gclient_utils.FileWrite(diff_tempfile, diff)
2820 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
2821 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
2822 if not clean_patch:
2823 # Normally patchset is set after upload. But because we exit, that never
2824 # happens. Updating here makes sure that subsequent uploads don't need
2825 # to fetch/apply the same diff again.
2826 self.SetPatchset(external_ps)
2827 DieWithError('\nPatch did not apply cleanly. Please resolve any '
2828 'conflicts and reupload.')
2829
2830 message = 'Incorporate external changes from '
2831 if num_changes == 1:
2832 message += 'patchset %d' % external_ps
2833 else:
2834 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
2835 RunGitSilent(['commit', '-am', message])
2836 # TODO(crbug.com/1382528): Use the previous commit's message as a default
2837 # patchset title instead of this 'Incorporate' message.
2838 return external_base
2839
Edward Lemura12175c2020-03-09 16:58:26 +00002840 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002841 """Re-commits using the current message, assumes the commit hook is in
2842 place.
2843 """
Edward Lemura12175c2020-03-09 16:58:26 +00002844 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002845 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002846 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002847 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002848 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002849
2850 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002851
tandriie113dfd2016-10-11 10:20:12 -07002852 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002853 try:
2854 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002855 except GerritChangeNotExists:
2856 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002857
2858 if data['status'] in ('ABANDONED', 'MERGED'):
2859 return 'CL %s is closed' % self.GetIssue()
2860
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002861 def GetGerritChange(self, patchset=None):
2862 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002863 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002864 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002865 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002866 data = self._GetChangeDetail(['ALL_REVISIONS'])
2867
2868 assert host and issue and patchset, 'CL must be uploaded first'
2869
2870 has_patchset = any(
2871 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002872 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002873 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002874 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002875 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002876
tandrii8c5a3532016-11-04 07:52:02 -07002877 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002878 'host': host,
2879 'change': issue,
2880 'project': data['project'],
2881 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002882 }
tandriie113dfd2016-10-11 10:20:12 -07002883
tandriide281ae2016-10-12 06:02:30 -07002884 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002885 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002886
Edward Lemur707d70b2018-02-07 00:50:14 +01002887 def GetReviewers(self):
2888 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002889 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002890
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002891
Lei Zhang8a0efc12020-08-05 19:58:45 +00002892def _get_bug_line_values(default_project_prefix, bugs):
2893 """Given default_project_prefix and comma separated list of bugs, yields bug
2894 line values.
tandriif9aefb72016-07-01 09:06:51 -07002895
2896 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00002897 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07002898 * string, which is left as is.
2899
2900 This function may produce more than one line, because bugdroid expects one
2901 project per line.
2902
Lei Zhang8a0efc12020-08-05 19:58:45 +00002903 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07002904 ['v8:123', 'chromium:789']
2905 """
2906 default_bugs = []
2907 others = []
2908 for bug in bugs.split(','):
2909 bug = bug.strip()
2910 if bug:
2911 try:
2912 default_bugs.append(int(bug))
2913 except ValueError:
2914 others.append(bug)
2915
2916 if default_bugs:
2917 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00002918 if default_project_prefix:
2919 if not default_project_prefix.endswith(':'):
2920 default_project_prefix += ':'
2921 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07002922 else:
2923 yield default_bugs
2924 for other in sorted(others):
2925 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2926 yield other
2927
2928
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002929class ChangeDescription(object):
2930 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002931 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002932 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002933 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002934 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002935 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002936 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2937 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002938 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002939 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002940
Dan Beamd8b04ca2019-10-10 21:23:26 +00002941 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002942 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002943 if bug:
2944 regexp = re.compile(self.BUG_LINE)
2945 prefix = settings.GetBugPrefix()
2946 if not any((regexp.match(line) for line in self._description_lines)):
2947 values = list(_get_bug_line_values(prefix, bug))
2948 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002949 if fixed:
2950 regexp = re.compile(self.FIXED_LINE)
2951 prefix = settings.GetBugPrefix()
2952 if not any((regexp.match(line) for line in self._description_lines)):
2953 values = list(_get_bug_line_values(prefix, fixed))
2954 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002955
agable@chromium.org42c20792013-09-12 17:34:49 +00002956 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002957 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002958 return '\n'.join(self._description_lines)
2959
2960 def set_description(self, desc):
2961 if isinstance(desc, basestring):
2962 lines = desc.splitlines()
2963 else:
2964 lines = [line.rstrip() for line in desc]
2965 while lines and not lines[0]:
2966 lines.pop(0)
2967 while lines and not lines[-1]:
2968 lines.pop(-1)
2969 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002970
Edward Lemur5a644f82020-03-18 16:44:57 +00002971 def ensure_change_id(self, change_id):
2972 description = self.description
2973 footer_change_ids = git_footers.get_footer_change_id(description)
2974 # Make sure that the Change-Id in the description matches the given one.
2975 if footer_change_ids != [change_id]:
2976 if footer_change_ids:
2977 # Remove any existing Change-Id footers since they don't match the
2978 # expected change_id footer.
2979 description = git_footers.remove_footer(description, 'Change-Id')
2980 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
2981 'if you want to set a new one.')
2982 # Add the expected Change-Id footer.
2983 description = git_footers.add_footer_change_id(description, change_id)
2984 self.set_description(description)
2985
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002986 def update_reviewers(self, reviewers, tbrs):
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002987 """Rewrites the R=/TBR= line(s) as a single line each.
2988
2989 Args:
2990 reviewers (list(str)) - list of additional emails to use for reviewers.
2991 tbrs (list(str)) - list of additional emails to use for TBRs.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002992 """
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002993 if not reviewers and not tbrs:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002994 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002995
2996 reviewers = set(reviewers)
2997 tbrs = set(tbrs)
2998 LOOKUP = {
2999 'TBR': tbrs,
3000 'R': reviewers,
3001 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003002
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003003 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003004 regexp = re.compile(self.R_LINE)
3005 matches = [regexp.match(line) for line in self._description_lines]
3006 new_desc = [l for i, l in enumerate(self._description_lines)
3007 if not matches[i]]
3008 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003009
agable@chromium.org42c20792013-09-12 17:34:49 +00003010 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003011
3012 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003013 for match in matches:
3014 if not match:
3015 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003016 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3017
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003018 # If any folks ended up in both groups, remove them from tbrs.
3019 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003020
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003021 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3022 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003023
3024 # Put the new lines in the description where the old first R= line was.
3025 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3026 if 0 <= line_loc < len(self._description_lines):
3027 if new_tbr_line:
3028 self._description_lines.insert(line_loc, new_tbr_line)
3029 if new_r_line:
3030 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003031 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003032 if new_r_line:
3033 self.append_footer(new_r_line)
3034 if new_tbr_line:
3035 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003036
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003037 def set_preserve_tryjobs(self):
3038 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3039 footers = git_footers.parse_footers(self.description)
3040 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3041 if v.lower() == 'true':
3042 return
3043 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3044
Anthony Polito8b955342019-09-24 19:01:36 +00003045 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003046 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003047 self.set_description([
3048 '# Enter a description of the change.',
3049 '# This will be displayed on the codereview site.',
3050 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003051 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003052 '--------------------',
3053 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003054 bug_regexp = re.compile(self.BUG_LINE)
3055 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003056 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003057 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003058
Dan Beamd8b04ca2019-10-10 21:23:26 +00003059 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003060 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003061
Bruce Dawsonfc487042020-10-27 19:11:37 +00003062 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003063 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003064 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003065 if not content:
3066 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003067 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003068
Bruce Dawson2377b012018-01-11 16:46:49 -08003069 # Strip off comments and default inserted "Bug:" line.
3070 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003071 (line.startswith('#') or
3072 line.rstrip() == "Bug:" or
3073 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003074 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003075 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003076 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003077
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003078 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003079 """Adds a footer line to the description.
3080
3081 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3082 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3083 that Gerrit footers are always at the end.
3084 """
3085 parsed_footer_line = git_footers.parse_footer(line)
3086 if parsed_footer_line:
3087 # Line is a gerrit footer in the form: Footer-Key: any value.
3088 # Thus, must be appended observing Gerrit footer rules.
3089 self.set_description(
3090 git_footers.add_footer(self.description,
3091 key=parsed_footer_line[0],
3092 value=parsed_footer_line[1]))
3093 return
3094
3095 if not self._description_lines:
3096 self._description_lines.append(line)
3097 return
3098
3099 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3100 if gerrit_footers:
3101 # git_footers.split_footers ensures that there is an empty line before
3102 # actual (gerrit) footers, if any. We have to keep it that way.
3103 assert top_lines and top_lines[-1] == ''
3104 top_lines, separator = top_lines[:-1], top_lines[-1:]
3105 else:
3106 separator = [] # No need for separator if there are no gerrit_footers.
3107
3108 prev_line = top_lines[-1] if top_lines else ''
3109 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3110 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3111 top_lines.append('')
3112 top_lines.append(line)
3113 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003114
tandrii99a72f22016-08-17 14:33:24 -07003115 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003116 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003117 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003118 reviewers = [match.group(2).strip()
3119 for match in matches
3120 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003121 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003122
bradnelsond975b302016-10-23 12:20:23 -07003123 def get_cced(self):
3124 """Retrieves the list of reviewers."""
3125 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3126 cced = [match.group(2).strip() for match in matches if match]
3127 return cleanup_list(cced)
3128
Nodir Turakulov23b82142017-11-16 11:04:25 -08003129 def get_hash_tags(self):
3130 """Extracts and sanitizes a list of Gerrit hashtags."""
3131 subject = (self._description_lines or ('',))[0]
3132 subject = re.sub(
3133 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3134
3135 tags = []
3136 start = 0
3137 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3138 while True:
3139 m = bracket_exp.match(subject, start)
3140 if not m:
3141 break
3142 tags.append(self.sanitize_hash_tag(m.group(1)))
3143 start = m.end()
3144
3145 if not tags:
3146 # Try "Tag: " prefix.
3147 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3148 if m:
3149 tags.append(self.sanitize_hash_tag(m.group(1)))
3150 return tags
3151
3152 @classmethod
3153 def sanitize_hash_tag(cls, tag):
3154 """Returns a sanitized Gerrit hash tag.
3155
3156 A sanitized hashtag can be used as a git push refspec parameter value.
3157 """
3158 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3159
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003160
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003161def FindCodereviewSettingsFile(filename='codereview.settings'):
3162 """Finds the given file starting in the cwd and going up.
3163
3164 Only looks up to the top of the repository unless an
3165 'inherit-review-settings-ok' file exists in the root of the repository.
3166 """
3167 inherit_ok_file = 'inherit-review-settings-ok'
3168 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003169 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003170 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003171 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003172 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003173 if os.path.isfile(os.path.join(cwd, filename)):
3174 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003175 if cwd == root:
3176 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003177 parent_dir = os.path.dirname(cwd)
3178 if parent_dir == cwd:
3179 # We hit the system root directory.
3180 break
3181 cwd = parent_dir
3182 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003183
3184
3185def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003186 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003187 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003188
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003189 def SetProperty(name, setting, unset_error_ok=False):
3190 fullname = 'rietveld.' + name
3191 if setting in keyvals:
3192 RunGit(['config', fullname, keyvals[setting]])
3193 else:
3194 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3195
tandrii48df5812016-10-17 03:55:37 -07003196 if not keyvals.get('GERRIT_HOST', False):
3197 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003198 # Only server setting is required. Other settings can be absent.
3199 # In that case, we ignore errors raised during option deletion attempt.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003200 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3201 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003202 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003203 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3204 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003205 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3206 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003207 SetProperty(
3208 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003209 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003210
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003211 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003212 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003213
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003214 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003215 RunGit(['config', 'gerrit.squash-uploads',
3216 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003217
tandrii@chromium.org28253532016-04-14 13:46:56 +00003218 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003219 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003220 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3221
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003222 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003223 # should be of the form
3224 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3225 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003226 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3227 keyvals['ORIGIN_URL_CONFIG']])
3228
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003229
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003230def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003231 """Downloads a network object to a local file, like urllib.urlretrieve.
3232
3233 This is necessary because urllib is broken for SSL connections via a proxy.
3234 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003235 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003236 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003237
3238
ukai@chromium.org712d6102013-11-27 00:52:58 +00003239def hasSheBang(fname):
3240 """Checks fname is a #! script."""
3241 with open(fname) as f:
3242 return f.read(2).startswith('#!')
3243
3244
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003245def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003246 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003247
3248 Args:
3249 force: True to update hooks. False to install hooks if not present.
3250 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003251 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003252 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3253 if not os.access(dst, os.X_OK):
3254 if os.path.exists(dst):
3255 if not force:
3256 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003257 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003258 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003259 if not hasSheBang(dst):
3260 DieWithError('Not a script: %s\n'
3261 'You need to download from\n%s\n'
3262 'into .git/hooks/commit-msg and '
3263 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003264 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3265 except Exception:
3266 if os.path.exists(dst):
3267 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003268 DieWithError('\nFailed to download hooks.\n'
3269 'You need to download from\n%s\n'
3270 'into .git/hooks/commit-msg and '
3271 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003272
3273
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003274class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003275 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003276
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003277 def __init__(self):
3278 # Cached list of [host, identity, source], where source is either
3279 # .gitcookies or .netrc.
3280 self._all_hosts = None
3281
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003282 def ensure_configured_gitcookies(self):
3283 """Runs checks and suggests fixes to make git use .gitcookies from default
3284 path."""
3285 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3286 configured_path = RunGitSilent(
3287 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003288 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003289 if configured_path:
3290 self._ensure_default_gitcookies_path(configured_path, default)
3291 else:
3292 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003293
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003294 @staticmethod
3295 def _ensure_default_gitcookies_path(configured_path, default_path):
3296 assert configured_path
3297 if configured_path == default_path:
3298 print('git is already configured to use your .gitcookies from %s' %
3299 configured_path)
3300 return
3301
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003302 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003303 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3304 (configured_path, default_path))
3305
3306 if not os.path.exists(configured_path):
3307 print('However, your configured .gitcookies file is missing.')
3308 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3309 action='reconfigure')
3310 RunGit(['config', '--global', 'http.cookiefile', default_path])
3311 return
3312
3313 if os.path.exists(default_path):
3314 print('WARNING: default .gitcookies file already exists %s' %
3315 default_path)
3316 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3317 default_path)
3318
3319 confirm_or_exit('Move existing .gitcookies to default location?',
3320 action='move')
3321 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003322 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003323 print('Moved and reconfigured git to use .gitcookies from %s' %
3324 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003325
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003326 @staticmethod
3327 def _configure_gitcookies_path(default_path):
3328 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3329 if os.path.exists(netrc_path):
3330 print('You seem to be using outdated .netrc for git credentials: %s' %
3331 netrc_path)
3332 print('This tool will guide you through setting up recommended '
3333 '.gitcookies store for git credentials.\n'
3334 '\n'
3335 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3336 ' git config --global --unset http.cookiefile\n'
3337 ' mv %s %s.backup\n\n' % (default_path, default_path))
3338 confirm_or_exit(action='setup .gitcookies')
3339 RunGit(['config', '--global', 'http.cookiefile', default_path])
3340 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003341
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003342 def get_hosts_with_creds(self, include_netrc=False):
3343 if self._all_hosts is None:
3344 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003345 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3346 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3347 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3348 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003349
3350 if include_netrc:
3351 return self._all_hosts
3352 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3353
3354 def print_current_creds(self, include_netrc=False):
3355 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3356 if not hosts:
3357 print('No Git/Gerrit credentials found')
3358 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003359 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003360 header = [('Host', 'User', 'Which file'),
3361 ['=' * l for l in lengths]]
3362 for row in (header + hosts):
3363 print('\t'.join((('%%+%ds' % l) % s)
3364 for l, s in zip(lengths, row)))
3365
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003366 @staticmethod
3367 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003368 """Parses identity "git-<username>.domain" into <username> and domain."""
3369 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003370 # distinguishable from sub-domains. But we do know typical domains:
3371 if identity.endswith('.chromium.org'):
3372 domain = 'chromium.org'
3373 username = identity[:-len('.chromium.org')]
3374 else:
3375 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003376 if username.startswith('git-'):
3377 username = username[len('git-'):]
3378 return username, domain
3379
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003380 def has_generic_host(self):
3381 """Returns whether generic .googlesource.com has been configured.
3382
3383 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3384 """
3385 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003386 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003387 return True
3388 return False
3389
3390 def _get_git_gerrit_identity_pairs(self):
3391 """Returns map from canonic host to pair of identities (Git, Gerrit).
3392
3393 One of identities might be None, meaning not configured.
3394 """
3395 host_to_identity_pairs = {}
3396 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003397 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003398 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3399 idx = 0 if canonical == host else 1
3400 pair[idx] = identity
3401 return host_to_identity_pairs
3402
3403 def get_partially_configured_hosts(self):
3404 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003405 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003406 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003407 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003408
3409 def get_conflicting_hosts(self):
3410 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003411 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003412 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003413 if None not in (i1, i2) and i1 != i2)
3414
3415 def get_duplicated_hosts(self):
3416 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003417 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003418
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003419
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003420 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003421 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003422 hosts = sorted(hosts)
3423 assert hosts
3424 if extra_column_func is None:
3425 extras = [''] * len(hosts)
3426 else:
3427 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003428 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3429 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003430 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003431 lines.append(tmpl % he)
3432 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003433
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003434 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003435 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003436 yield ('.googlesource.com wildcard record detected',
3437 ['Chrome Infrastructure team recommends to list full host names '
3438 'explicitly.'],
3439 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003440
3441 dups = self.get_duplicated_hosts()
3442 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003443 yield ('The following hosts were defined twice',
3444 self._format_hosts(dups),
3445 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003446
3447 partial = self.get_partially_configured_hosts()
3448 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003449 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3450 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003451 self._format_hosts(
3452 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3453 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003454
3455 conflicting = self.get_conflicting_hosts()
3456 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003457 yield ('The following Git hosts have differing credentials from their '
3458 'Gerrit counterparts',
3459 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3460 tuple(self._get_git_gerrit_identity_pairs()[host])),
3461 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003462
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003463 def find_and_report_problems(self):
3464 """Returns True if there was at least one problem, else False."""
3465 found = False
3466 bad_hosts = set()
3467 for title, sublines, hosts in self._find_problems():
3468 if not found:
3469 found = True
3470 print('\n\n.gitcookies problem report:\n')
3471 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003472 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003473 if sublines:
3474 print()
3475 print(' %s' % '\n '.join(sublines))
3476 print()
3477
3478 if bad_hosts:
3479 assert found
3480 print(' You can manually remove corresponding lines in your %s file and '
3481 'visit the following URLs with correct account to generate '
3482 'correct credential lines:\n' %
3483 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003484 print(' %s' % '\n '.join(
3485 sorted(
3486 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3487 _canonical_git_googlesource_host(host))
3488 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003489 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003490
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003491
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003492@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003493def CMDcreds_check(parser, args):
3494 """Checks credentials and suggests changes."""
3495 _, _ = parser.parse_args(args)
3496
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003497 # Code below checks .gitcookies. Abort if using something else.
3498 authn = gerrit_util.Authenticator.get()
3499 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003500 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003501 'This command is not designed for bot environment. It checks '
3502 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003503 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3504 if isinstance(authn, gerrit_util.GceAuthenticator):
3505 message += (
3506 '\n'
3507 'If you need to run this on GCE or a cloudtop instance, '
3508 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3509 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003510
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003511 checker = _GitCookiesChecker()
3512 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003513
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003514 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003515 checker.print_current_creds(include_netrc=True)
3516
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003517 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003518 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003519 return 0
3520 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003521
3522
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003523@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003524def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003525 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003526 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003527 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003528 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003529 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003530 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003531 return RunGit(['config', 'branch.%s.base-url' % branch],
3532 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003533
3534 print('Setting base-url to %s' % args[0])
3535 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3536 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003537
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003538
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003539def color_for_status(status):
3540 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003541 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003542 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003543 'unsent': BOLD + Fore.YELLOW,
3544 'waiting': BOLD + Fore.RED,
3545 'reply': BOLD + Fore.YELLOW,
3546 'not lgtm': BOLD + Fore.RED,
3547 'lgtm': BOLD + Fore.GREEN,
3548 'commit': BOLD + Fore.MAGENTA,
3549 'closed': BOLD + Fore.CYAN,
3550 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003551 }.get(status, Fore.WHITE)
3552
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003553
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003554def get_cl_statuses(changes, fine_grained, max_processes=None):
3555 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003556
3557 If fine_grained is true, this will fetch CL statuses from the server.
3558 Otherwise, simply indicate if there's a matching url for the given branches.
3559
3560 If max_processes is specified, it is used as the maximum number of processes
3561 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3562 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003563
3564 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003565 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003566 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003567 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003568
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003569 if not fine_grained:
3570 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003571 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003572 for cl in changes:
3573 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003574 return
3575
3576 # First, sort out authentication issues.
3577 logging.debug('ensuring credentials exist')
3578 for cl in changes:
3579 cl.EnsureAuthenticated(force=False, refresh=True)
3580
3581 def fetch(cl):
3582 try:
3583 return (cl, cl.GetStatus())
3584 except:
3585 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003586 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003587 raise
3588
3589 threads_count = len(changes)
3590 if max_processes:
3591 threads_count = max(1, min(threads_count, max_processes))
3592 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3593
Edward Lemur61bf4172020-02-24 23:22:37 +00003594 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003595 fetched_cls = set()
3596 try:
3597 it = pool.imap_unordered(fetch, changes).__iter__()
3598 while True:
3599 try:
3600 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003601 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003602 break
3603 fetched_cls.add(cl)
3604 yield cl, status
3605 finally:
3606 pool.close()
3607
3608 # Add any branches that failed to fetch.
3609 for cl in set(changes) - fetched_cls:
3610 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003611
rmistry@google.com2dd99862015-06-22 12:22:18 +00003612
Jose Lopes3863fc52020-04-07 17:00:25 +00003613def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003614 """Uploads CLs of local branches that are dependents of the current branch.
3615
3616 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003617
3618 test1 -> test2.1 -> test3.1
3619 -> test3.2
3620 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003621
3622 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3623 run on the dependent branches in this order:
3624 test2.1, test3.1, test3.2, test2.2, test3.3
3625
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003626 Note: This function does not rebase your local dependent branches. Use it
3627 when you make a change to the parent branch that will not conflict
3628 with its dependent branches, and you would like their dependencies
3629 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003630 """
3631 if git_common.is_dirty_git_tree('upload-branch-deps'):
3632 return 1
3633
3634 root_branch = cl.GetBranch()
3635 if root_branch is None:
3636 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3637 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003638 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003639 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3640 'patchset dependencies without an uploaded CL.')
3641
3642 branches = RunGit(['for-each-ref',
3643 '--format=%(refname:short) %(upstream:short)',
3644 'refs/heads'])
3645 if not branches:
3646 print('No local branches found.')
3647 return 0
3648
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003649 # Create a dictionary of all local branches to the branches that are
3650 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003651 tracked_to_dependents = collections.defaultdict(list)
3652 for b in branches.splitlines():
3653 tokens = b.split()
3654 if len(tokens) == 2:
3655 branch_name, tracked = tokens
3656 tracked_to_dependents[tracked].append(branch_name)
3657
vapiera7fbd5a2016-06-16 09:17:49 -07003658 print()
3659 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003661
rmistry@google.com2dd99862015-06-22 12:22:18 +00003662 def traverse_dependents_preorder(branch, padding=''):
3663 dependents_to_process = tracked_to_dependents.get(branch, [])
3664 padding += ' '
3665 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003666 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003667 dependents.append(dependent)
3668 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003669
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003671 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003672
3673 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675 return 0
3676
Jose Lopes3863fc52020-04-07 17:00:25 +00003677 if not force:
3678 confirm_or_exit('This command will checkout all dependent branches and run '
3679 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003680
rmistry@google.com2dd99862015-06-22 12:22:18 +00003681 # Record all dependents that failed to upload.
3682 failures = {}
3683 # Go through all dependents, checkout the branch and upload.
3684 try:
3685 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print()
3687 print('--------------------------------------')
3688 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003689 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003690 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003691 try:
3692 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003693 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003694 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003695 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003696 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 finally:
3699 # Swap back to the original root branch.
3700 RunGit(['checkout', '-q', root_branch])
3701
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print()
3703 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003704 for dependent_branch in dependents:
3705 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003706 print(' %s : %s' % (dependent_branch, upload_status))
3707 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003708
3709 return 0
3710
3711
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003712def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003713 """Given a proposed tag name, returns a tag name that is guaranteed to be
3714 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3715 or 'foo-3', and so on."""
3716
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003717 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003718 for suffix_num in itertools.count(1):
3719 if suffix_num == 1:
3720 to_check = proposed_tag
3721 else:
3722 to_check = '%s-%d' % (proposed_tag, suffix_num)
3723
3724 if to_check not in existing_tags:
3725 return to_check
3726
3727
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003728@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003729def CMDarchive(parser, args):
3730 """Archives and deletes branches associated with closed changelists."""
3731 parser.add_option(
3732 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003733 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003734 parser.add_option(
3735 '-f', '--force', action='store_true',
3736 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003737 parser.add_option(
3738 '-d', '--dry-run', action='store_true',
3739 help='Skip the branch tagging and removal steps.')
3740 parser.add_option(
3741 '-t', '--notags', action='store_true',
3742 help='Do not tag archived branches. '
3743 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003744 parser.add_option(
3745 '-p',
3746 '--pattern',
3747 default='git-cl-archived-{issue}-{branch}',
3748 help='Format string for archive tags. '
3749 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003750
kmarshall3bff56b2016-06-06 18:31:47 -07003751 options, args = parser.parse_args(args)
3752 if args:
3753 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003754
3755 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3756 if not branches:
3757 return 0
3758
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003759 tags = RunGit(['for-each-ref', '--format=%(refname)',
3760 'refs/tags']).splitlines() or []
3761 tags = [t.split('/')[-1] for t in tags]
3762
vapiera7fbd5a2016-06-16 09:17:49 -07003763 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003764 changes = [Changelist(branchref=b)
3765 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003766 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3767 statuses = get_cl_statuses(changes,
3768 fine_grained=True,
3769 max_processes=options.maxjobs)
3770 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003771 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3772 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003773 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003774 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003775 proposal.sort()
3776
3777 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003778 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003779 return 0
3780
Edward Lemur85153282020-02-14 22:06:29 +00003781 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003782
vapiera7fbd5a2016-06-16 09:17:49 -07003783 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003784 if options.notags:
3785 for next_item in proposal:
3786 print(' ' + next_item[0])
3787 else:
3788 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3789 for next_item in proposal:
3790 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003791
kmarshall9249e012016-08-23 12:02:16 -07003792 # Quit now on precondition failure or if instructed by the user, either
3793 # via an interactive prompt or by command line flags.
3794 if options.dry_run:
3795 print('\nNo changes were made (dry run).\n')
3796 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003797
3798 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003799 print('You are currently on a branch \'%s\' which is associated with a '
3800 'closed codereview issue, so archive cannot proceed. Please '
3801 'checkout another branch and run this command again.' %
3802 current_branch)
3803 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003804
3805 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003806 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003807 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003808 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003809 return 1
3810
3811 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003812 if not options.notags:
3813 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003814
3815 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3816 # Clean up the tag if we failed to delete the branch.
3817 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003818
vapiera7fbd5a2016-06-16 09:17:49 -07003819 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003820
3821 return 0
3822
3823
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003824@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003825def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003826 """Show status of changelists.
3827
3828 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003829 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003830 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003831 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003832 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003833 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003834 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003835 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003836
3837 Also see 'git cl comments'.
3838 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003839 parser.add_option(
3840 '--no-branch-color',
3841 action='store_true',
3842 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003843 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003844 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003845 parser.add_option('-f', '--fast', action='store_true',
3846 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003847 parser.add_option(
3848 '-j', '--maxjobs', action='store', type=int,
3849 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00003850 parser.add_option(
3851 '-i', '--issue', type=int,
3852 help='Operate on this issue instead of the current branch\'s implicit '
3853 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003854 parser.add_option('-d',
3855 '--date-order',
3856 action='store_true',
3857 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003858 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003859 if args:
3860 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003861
iannuccie53c9352016-08-17 14:40:40 -07003862 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00003863 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07003864
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003865 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003866 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003867 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00003868 if cl.GetIssue():
3869 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003870 elif options.field == 'id':
3871 issueid = cl.GetIssue()
3872 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003873 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003874 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003875 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003876 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003878 elif options.field == 'status':
3879 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003880 elif options.field == 'url':
3881 url = cl.GetIssueURL()
3882 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003883 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003884 return 0
3885
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003886 branches = RunGit([
3887 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
3888 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003889 if not branches:
3890 print('No local branch found.')
3891 return 0
3892
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003893 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003894 Changelist(branchref=b, commit_date=ct)
3895 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
3896 ]
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003898 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003899 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003900 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003901
Edward Lemur85153282020-02-14 22:06:29 +00003902 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00003903
3904 def FormatBranchName(branch, colorize=False):
3905 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3906 an asterisk when it is the current branch."""
3907
3908 asterisk = ""
3909 color = Fore.RESET
3910 if branch == current_branch:
3911 asterisk = "* "
3912 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00003913 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00003914
3915 if colorize:
3916 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003917 return asterisk + branch_name
3918
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003919 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003920
3921 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00003922
3923 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003924 sorted_changes = sorted(changes,
3925 key=lambda c: c.GetCommitDate(),
3926 reverse=True)
3927 else:
3928 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
3929 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003930 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003931 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003932 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003933 branch_statuses[c.GetBranch()] = status
3934 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00003935 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003936 if url and (not status or status == 'error'):
3937 # The issue probably doesn't exist anymore.
3938 url += ' (broken)'
3939
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003940 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003941 # Turn off bold as well as colors.
3942 END = '\033[0m'
3943 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003944 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003945 color = ''
3946 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003947 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003948
Alan Cuttera3be9a52019-03-04 18:50:33 +00003949 branch_display = FormatBranchName(branch)
3950 padding = ' ' * (alignment - len(branch_display))
3951 if not options.no_branch_color:
3952 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003953
Alan Cuttera3be9a52019-03-04 18:50:33 +00003954 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3955 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003956
vapiera7fbd5a2016-06-16 09:17:49 -07003957 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003958 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003959 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003960 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003961 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003962 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003963 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003964 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003965 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003966 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00003968 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003969 return 0
3970
3971
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003972def colorize_CMDstatus_doc():
3973 """To be called once in main() to add colors to git cl status help."""
3974 colors = [i for i in dir(Fore) if i[0].isupper()]
3975
3976 def colorize_line(line):
3977 for color in colors:
3978 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003979 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003980 indent = len(line) - len(line.lstrip(' ')) + 1
3981 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3982 return line
3983
3984 lines = CMDstatus.__doc__.splitlines()
3985 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3986
3987
phajdan.jre328cf92016-08-22 04:12:17 -07003988def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003989 if path == '-':
3990 json.dump(contents, sys.stdout)
3991 else:
3992 with open(path, 'w') as f:
3993 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003994
3995
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003996@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003997@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003998def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003999 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004000
4001 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004002 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004003 parser.add_option('-r', '--reverse', action='store_true',
4004 help='Lookup the branch(es) for the specified issues. If '
4005 'no issues are specified, all branches with mapped '
4006 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004007 parser.add_option('--json',
4008 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004009 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004010
dnj@chromium.org406c4402015-03-03 17:22:28 +00004011 if options.reverse:
4012 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004013 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004014 # Reverse issue lookup.
4015 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004016
4017 git_config = {}
4018 for config in RunGit(['config', '--get-regexp',
4019 r'branch\..*issue']).splitlines():
4020 name, _space, val = config.partition(' ')
4021 git_config[name] = val
4022
dnj@chromium.org406c4402015-03-03 17:22:28 +00004023 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004024 issue = git_config.get(
4025 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004026 if issue:
4027 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004028 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004029 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004030 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004031 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004032 try:
4033 issue_num = int(issue)
4034 except ValueError:
4035 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004036 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004037 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004039 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004040 if options.json:
4041 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004042 return 0
4043
4044 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004045 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004046 if not issue.valid:
4047 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4048 'or no argument to list it.\n'
4049 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004050 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004051 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004052 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004053 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004054 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4055 if options.json:
4056 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004057 'gerrit_host': cl.GetGerritHost(),
4058 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004059 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004060 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004061 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062 return 0
4063
4064
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004065@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004066def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004067 """Shows or posts review comments for any changelist."""
4068 parser.add_option('-a', '--add-comment', dest='comment',
4069 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004070 parser.add_option('-p', '--publish', action='store_true',
4071 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004072 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004073 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004074 parser.add_option('-m', '--machine-readable', dest='readable',
4075 action='store_false', default=True,
4076 help='output comments in a format compatible with '
4077 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004078 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004079 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004080 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004081
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004082 issue = None
4083 if options.issue:
4084 try:
4085 issue = int(options.issue)
4086 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004087 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004088
Edward Lemur934836a2019-09-09 20:16:54 +00004089 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004090
4091 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004092 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004093 return 0
4094
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004095 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4096 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004097 for comment in summary:
4098 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004099 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004100 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004101 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004102 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004103 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004104 elif comment.autogenerated:
4105 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004106 else:
4107 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004108 print('\n%s%s %s%s\n%s' % (
4109 color,
4110 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4111 comment.sender,
4112 Fore.RESET,
4113 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4114
smut@google.comc85ac942015-09-15 16:34:43 +00004115 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004116 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004117 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004118 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4119 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004120 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004121 return 0
4122
4123
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004124@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004125@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004126def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004127 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004128 parser.add_option('-d', '--display', action='store_true',
4129 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004130 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004131 help='New description to set for this issue (- for stdin, '
4132 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004133 parser.add_option('-f', '--force', action='store_true',
4134 help='Delete any unpublished Gerrit edits for this issue '
4135 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004136
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004137 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004138
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004139 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004140 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004141 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004142 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004143 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004144
Edward Lemur934836a2019-09-09 20:16:54 +00004145 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004146 if target_issue_arg:
4147 kwargs['issue'] = target_issue_arg.issue
4148 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004149
4150 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004151 if not cl.GetIssue():
4152 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004153
Edward Lemur678a6842019-10-03 22:25:05 +00004154 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004155 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004156
Edward Lemur6c6827c2020-02-06 21:15:18 +00004157 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004158
smut@google.com34fb6b12015-07-13 20:03:26 +00004159 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004160 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004161 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004162
4163 if options.new_description:
4164 text = options.new_description
4165 if text == '-':
4166 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004167 elif text == '+':
4168 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004169 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004170
4171 description.set_description(text)
4172 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004173 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004174 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004175 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004176 return 0
4177
4178
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004179@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004180def CMDlint(parser, args):
4181 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004182 parser.add_option('--filter', action='append', metavar='-x,+y',
4183 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004184 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004185
4186 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004187 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004188 try:
4189 import cpplint
4190 import cpplint_chromium
4191 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004193 return 1
4194
4195 # Change the current working directory before calling lint so that it
4196 # shows the correct base.
4197 previous_cwd = os.getcwd()
4198 os.chdir(settings.GetRoot())
4199 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004200 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004201 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004202 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004203 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004204 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004205
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004206 # Process cpplint arguments, if any.
4207 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4208 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004209 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004210
Lei Zhang379d1ad2020-07-15 19:40:06 +00004211 include_regex = re.compile(settings.GetLintRegex())
4212 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004213 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4214 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004215 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004217 continue
4218
4219 if ignore_regex.match(filename):
4220 print('Ignoring file %s' % filename)
4221 continue
4222
4223 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4224 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004225 finally:
4226 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004227 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004228 if cpplint._cpplint_state.error_count != 0:
4229 return 1
4230 return 0
4231
4232
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004233@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004234def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004235 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004236 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004237 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004238 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004239 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004240 parser.add_option('--all', action='store_true',
4241 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004242 parser.add_option('--files',
4243 nargs=1,
4244 help='Semicolon-separated list of files to be marked as '
4245 'modified when executing presubmit or post-upload hooks. '
4246 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004247 parser.add_option('--parallel', action='store_true',
4248 help='Run all tests specified by input_api.RunTests in all '
4249 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004250 parser.add_option('--resultdb', action='store_true',
4251 help='Run presubmit checks in the ResultSink environment '
4252 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004253 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004254 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004255
sbc@chromium.org71437c02015-04-09 19:29:40 +00004256 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004257 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004258 return 1
4259
Edward Lemur934836a2019-09-09 20:16:54 +00004260 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261 if args:
4262 base_branch = args[0]
4263 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004264 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004265 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004266
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004267 start = time.time()
4268 try:
4269 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4270 description = cl.FetchDescription()
4271 else:
4272 description = _create_description_from_log([base_branch])
4273 except Exception as e:
4274 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004275 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004276 elapsed = time.time() - start
4277 if elapsed > 5:
4278 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004279
Bruce Dawson13acea32022-05-03 22:13:08 +00004280 if not base_branch:
4281 if not options.force:
4282 print('use --force to check even when not on a branch.')
4283 return 1
4284 base_branch = 'HEAD'
4285
Josip Sokcevic017544d2022-03-31 23:47:53 +00004286 cl.RunHook(committing=not options.upload,
4287 may_prompt=False,
4288 verbose=options.verbose,
4289 parallel=options.parallel,
4290 upstream=base_branch,
4291 description=description,
4292 all_files=options.all,
4293 files=options.files,
4294 resultdb=options.resultdb,
4295 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004296 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004297
4298
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004299def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004300 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004301
4302 Works the same way as
4303 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4304 but can be called on demand on all platforms.
4305
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004306 The basic idea is to generate git hash of a state of the tree, original
4307 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004308 """
4309 lines = []
4310 tree_hash = RunGitSilent(['write-tree'])
4311 lines.append('tree %s' % tree_hash.strip())
4312 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4313 if code == 0:
4314 lines.append('parent %s' % parent.strip())
4315 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4316 lines.append('author %s' % author.strip())
4317 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4318 lines.append('committer %s' % committer.strip())
4319 lines.append('')
4320 # Note: Gerrit's commit-hook actually cleans message of some lines and
4321 # whitespace. This code is not doing this, but it clearly won't decrease
4322 # entropy.
4323 lines.append(message)
4324 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004325 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004326 return 'I%s' % change_hash.strip()
4327
4328
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004329def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004330 """Computes the remote branch ref to use for the CL.
4331
4332 Args:
4333 remote (str): The git remote for the CL.
4334 remote_branch (str): The git remote branch for the CL.
4335 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004336 """
4337 if not (remote and remote_branch):
4338 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004339
wittman@chromium.org455dc922015-01-26 20:15:50 +00004340 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004341 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004342 # refs, which are then translated into the remote full symbolic refs
4343 # below.
4344 if '/' not in target_branch:
4345 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4346 else:
4347 prefix_replacements = (
4348 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4349 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4350 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4351 )
4352 match = None
4353 for regex, replacement in prefix_replacements:
4354 match = re.search(regex, target_branch)
4355 if match:
4356 remote_branch = target_branch.replace(match.group(0), replacement)
4357 break
4358 if not match:
4359 # This is a branch path but not one we recognize; use as-is.
4360 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004361 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004362 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004363 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004364 # Handle the refs that need to land in different refs.
4365 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004366
wittman@chromium.org455dc922015-01-26 20:15:50 +00004367 # Create the true path to the remote branch.
4368 # Does the following translation:
4369 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004370 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004371 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4372 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4373 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4374 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4375 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4376 'refs/heads/')
4377 elif remote_branch.startswith('refs/remotes/branch-heads'):
4378 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004379
wittman@chromium.org455dc922015-01-26 20:15:50 +00004380 return remote_branch
4381
4382
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004383def cleanup_list(l):
4384 """Fixes a list so that comma separated items are put as individual items.
4385
4386 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4387 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4388 """
4389 items = sum((i.split(',') for i in l), [])
4390 stripped_items = (i.strip() for i in items)
4391 return sorted(filter(None, stripped_items))
4392
4393
Aaron Gable4db38df2017-11-03 14:59:07 -07004394@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004395@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004396def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004397 """Uploads the current changelist to codereview.
4398
4399 Can skip dependency patchset uploads for a branch by running:
4400 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004401 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004402 git config --unset branch.branch_name.skip-deps-uploads
4403 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004404
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004405 If the name of the checked out branch starts with "bug-" or "fix-" followed
4406 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004407 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004408
4409 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004410 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004411 [git-cl] add support for hashtags
4412 Foo bar: implement foo
4413 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004414 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004415 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4416 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004417 parser.add_option('--bypass-watchlists', action='store_true',
4418 dest='bypass_watchlists',
4419 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004420 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004421 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004422 parser.add_option('--message', '-m', dest='message',
4423 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004424 parser.add_option('-b', '--bug',
4425 help='pre-populate the bug number(s) for this issue. '
4426 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004427 parser.add_option('--message-file', dest='message_file',
4428 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004429 parser.add_option('--title', '-t', dest='title',
4430 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004431 parser.add_option('-T', '--skip-title', action='store_true',
4432 dest='skip_title',
4433 help='Use the most recent commit message as the title of '
4434 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004435 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004436 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004437 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004438 parser.add_option('--tbrs',
4439 action='append', default=[],
4440 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004441 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004442 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004443 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004444 parser.add_option('--hashtag', dest='hashtags',
4445 action='append', default=[],
4446 help=('Gerrit hashtag for new CL; '
4447 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004448 parser.add_option('-s',
4449 '--send-mail',
4450 '--send-email',
4451 dest='send_mail',
4452 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004453 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004454 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004455 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004456 metavar='TARGET',
4457 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004458 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004459 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004460 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004461 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004462 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004463 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004464 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004465 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4466 const='TBR', help='add a set of OWNERS to TBR')
4467 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4468 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004469 parser.add_option('-c',
4470 '--use-commit-queue',
4471 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004472 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004473 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004474 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004475 parser.add_option('-d', '--cq-dry-run',
4476 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004477 help='Send the patchset to do a CQ dry run right after '
4478 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004479 parser.add_option(
4480 '-q',
4481 '--cq-quick-run',
4482 action='store_true',
4483 default=False,
4484 help='Send the patchset to do a CQ quick run right after '
4485 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4486 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004487 parser.add_option('--set-bot-commit', action='store_true',
4488 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004489 parser.add_option('--preserve-tryjobs', action='store_true',
4490 help='instruct the CQ to let tryjobs running even after '
4491 'new patchsets are uploaded instead of canceling '
4492 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004493 parser.add_option('--dependencies', action='store_true',
4494 help='Uploads CLs of all the local branches that depend on '
4495 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004496 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4497 help='Sends your change to the CQ after an approval. Only '
4498 'works on repos that have the Auto-Submit label '
4499 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004500 parser.add_option('--parallel', action='store_true',
4501 help='Run all tests specified by input_api.RunTests in all '
4502 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004503 parser.add_option('--no-autocc', action='store_true',
4504 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004505 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004506 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004507 parser.add_option('-R', '--retry-failed', action='store_true',
4508 help='Retry failed tryjobs from old patchset immediately '
4509 'after uploading new patchset. Cannot be used with '
4510 '--use-commit-queue or --cq-dry-run.')
4511 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4512 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004513 parser.add_option('--fixed', '-x',
4514 help='List of bugs that will be commented on and marked '
4515 'fixed (pre-populates "Fixed:" tag). Same format as '
4516 '-b option / "Bug:" tag. If fixing several issues, '
4517 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004518 parser.add_option('--edit-description', action='store_true', default=False,
4519 help='Modify description before upload. Cannot be used '
4520 'with --force. It is a noop when --no-squash is set '
4521 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004522 parser.add_option('--git-completion-helper', action="store_true",
4523 help=optparse.SUPPRESS_HELP)
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004524 parser.add_option('--resultdb', action='store_true',
4525 help='Run presubmit checks in the ResultSink environment '
4526 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004527 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004528 parser.add_option('-o',
4529 '--push-options',
4530 action='append',
4531 default=[],
4532 help='Transmit the given string to the server when '
4533 'performing git push (pass-through). See git-push '
4534 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004535 parser.add_option('--no-add-changeid',
4536 action='store_true',
4537 dest='no_add_changeid',
4538 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004539 parser.add_option('--no-python2-post-upload-hooks',
4540 action='store_true',
4541 help='Only run post-upload hooks in Python 3.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004542
rmistry@google.com2dd99862015-06-22 12:22:18 +00004543 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004544 (options, args) = parser.parse_args(args)
4545
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004546 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004547 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4548 if opt.help != optparse.SUPPRESS_HELP))
4549 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004550
sbc@chromium.org71437c02015-04-09 19:29:40 +00004551 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004552 return 1
4553
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004554 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004555 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004556 options.cc = cleanup_list(options.cc)
4557
Josipe827b0f2020-01-30 00:07:20 +00004558 if options.edit_description and options.force:
4559 parser.error('Only one of --force and --edit-description allowed')
4560
tandriib80458a2016-06-23 12:20:07 -07004561 if options.message_file:
4562 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004563 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004564 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004565
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004566 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004567 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004568 options.use_commit_queue,
4569 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004570 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4571 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004572
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004573 if options.skip_title and options.title:
4574 parser.error('Only one of --title and --skip-title allowed.')
4575
Aaron Gableedbc4132017-09-11 13:22:28 -07004576 if options.use_commit_queue:
4577 options.send_mail = True
4578
Edward Lesmes0dd54822020-03-26 18:24:25 +00004579 if options.squash is None:
4580 # Load default for user, repo, squash=true, in this order.
4581 options.squash = settings.GetSquashGerritUploads()
4582
Josip Sokcevic1cabb172021-04-08 19:15:35 +00004583 cl = Changelist(branchref=options.target_branch)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004584 # Warm change details cache now to avoid RPCs later, reducing latency for
4585 # developers.
4586 if cl.GetIssue():
4587 cl._GetChangeDetail(
4588 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4589
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004590 if options.retry_failed and not cl.GetIssue():
4591 print('No previous patchsets, so --retry-failed has no effect.')
4592 options.retry_failed = False
Edward Lesmes7677e5c2020-02-19 20:39:03 +00004593
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004594 # cl.GetMostRecentPatchset uses cached information, and can return the last
4595 # patchset before upload. Calling it here makes it clear that it's the
4596 # last patchset before upload. Note that GetMostRecentPatchset will fail
4597 # if no CL has been uploaded yet.
4598 if options.retry_failed:
4599 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004600
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004601 ret = cl.CMDUpload(options, args, orig_args)
4602
4603 if options.retry_failed:
4604 if ret != 0:
4605 print('Upload failed, so --retry-failed has no effect.')
4606 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004607 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004608 cl, options.buildbucket_host, latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004609 jobs = _filter_failed_for_retry(builds)
4610 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004611 print('No failed tryjobs, so --retry-failed has no effect.')
4612 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004613 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004614
4615 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004616
4617
Francois Dorayd42c6812017-05-30 15:10:20 -04004618@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004619@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004620def CMDsplit(parser, args):
4621 """Splits a branch into smaller branches and uploads CLs.
4622
4623 Creates a branch and uploads a CL for each group of files modified in the
4624 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00004625 comment, the string '$directory', is replaced with the directory containing
4626 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04004627 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004628 parser.add_option('-d', '--description', dest='description_file',
4629 help='A text file containing a CL description in which '
4630 '$directory will be replaced by each CL\'s directory.')
4631 parser.add_option('-c', '--comment', dest='comment_file',
4632 help='A text file containing a CL comment.')
4633 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004634 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004635 help='List the files and reviewers for each CL that would '
4636 'be created, but don\'t create branches or CLs.')
4637 parser.add_option('--cq-dry-run', action='store_true',
4638 help='If set, will do a cq dry run for each uploaded CL. '
4639 'Please be careful when doing this; more than ~10 CLs '
4640 'has the potential to overload our build '
4641 'infrastructure. Try to upload these not during high '
4642 'load times (usually 11-3 Mountain View time). Email '
4643 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004644 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4645 default=True,
4646 help='Sends your change to the CQ after an approval. Only '
4647 'works on repos that have the Auto-Submit label '
4648 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00004649 parser.add_option('--max-depth',
4650 type='int',
4651 default=0,
4652 help='The max depth to look for OWNERS files. Useful for '
4653 'controlling the granularity of the split CLs, e.g. '
4654 '--max-depth=1 will only split by top-level '
4655 'directory. Specifying a value less than 1 means no '
4656 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04004657 options, _ = parser.parse_args(args)
4658
4659 if not options.description_file:
4660 parser.error('No --description flag specified.')
4661
4662 def WrappedCMDupload(args):
4663 return CMDupload(OptionParser(), args)
4664
Daniel Cheng403c44e2022-10-05 22:24:58 +00004665 return split_cl.SplitCl(options.description_file, options.comment_file,
4666 Changelist, WrappedCMDupload, options.dry_run,
4667 options.cq_dry_run, options.enable_auto_submit,
4668 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04004669
4670
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004671@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004672@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004673def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004674 """DEPRECATED: Used to commit the current changelist via git-svn."""
4675 message = ('git-cl no longer supports committing to SVN repositories via '
4676 'git-svn. You probably want to use `git cl land` instead.')
4677 print(message)
4678 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004679
4680
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004681@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004682@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004683def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004684 """Commits the current changelist via git.
4685
4686 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4687 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004688 """
4689 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4690 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004691 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004692 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004693 parser.add_option('--parallel', action='store_true',
4694 help='Run all tests specified by input_api.RunTests in all '
4695 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004696 parser.add_option('--resultdb', action='store_true',
4697 help='Run presubmit checks in the ResultSink environment '
4698 'and send results to the ResultDB database.')
4699 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004700 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004701
Edward Lemur934836a2019-09-09 20:16:54 +00004702 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004703
Robert Iannucci2e73d432018-03-14 01:10:47 -07004704 if not cl.GetIssue():
4705 DieWithError('You must upload the change first to Gerrit.\n'
4706 ' If you would rather have `git cl land` upload '
4707 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004708 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
4709 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004710
4711
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004712@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004713@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004714def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004715 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004716 parser.add_option('-b', dest='newbranch',
4717 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004718 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004719 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004720 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004721 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004722
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004723 group = optparse.OptionGroup(
4724 parser,
4725 'Options for continuing work on the current issue uploaded from a '
4726 'different clone (e.g. different machine). Must be used independently '
4727 'from the other options. No issue number should be specified, and the '
4728 'branch must have an issue number associated with it')
4729 group.add_option('--reapply', action='store_true', dest='reapply',
4730 help='Reset the branch and reapply the issue.\n'
4731 'CAUTION: This will undo any local changes in this '
4732 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004733
4734 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004735 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004736 parser.add_option_group(group)
4737
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004738 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004739
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004740 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004741 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004742 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004743 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004744 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004745
Edward Lemur934836a2019-09-09 20:16:54 +00004746 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004747 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004748 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004749
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004750 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004751 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004752 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004753
4754 RunGit(['reset', '--hard', upstream])
4755 if options.pull:
4756 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004757
Edward Lemur678a6842019-10-03 22:25:05 +00004758 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004759 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
4760 False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004761
4762 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004763 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004764
Edward Lemurf38bc172019-09-03 21:02:13 +00004765 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004766 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004767 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004768
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004769 # We don't want uncommitted changes mixed up with the patch.
4770 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004771 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004772
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004773 if options.newbranch:
4774 if options.force:
4775 RunGit(['branch', '-D', options.newbranch],
4776 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00004777 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004778
Edward Lemur678a6842019-10-03 22:25:05 +00004779 cl = Changelist(
4780 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004781
Edward Lemur678a6842019-10-03 22:25:05 +00004782 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004783 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004784
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00004785 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
4786 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004787
4788
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004789def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004790 """Fetches the tree status and returns either 'open', 'closed',
4791 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004792 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004793 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004794 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004795 if status.find('closed') != -1 or status == '0':
4796 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004797
4798 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004799 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004800
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004801 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004802 return 'unset'
4803
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004805def GetTreeStatusReason():
4806 """Fetches the tree status from a json url and returns the message
4807 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004808 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00004809 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004810 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004811 status = json.loads(connection.read())
4812 connection.close()
4813 return status['message']
4814
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004815
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004816@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004817def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004818 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004819 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004820 status = GetTreeStatus()
4821 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004822 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004823 return 2
4824
vapiera7fbd5a2016-06-16 09:17:49 -07004825 print('The tree is %s' % status)
4826 print()
4827 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004828 if status != 'open':
4829 return 1
4830 return 0
4831
4832
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004833@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004834def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004835 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4836 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004837 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004838 '-b', '--bot', action='append',
4839 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4840 'times to specify multiple builders. ex: '
4841 '"-b win_rel -b win_layout". See '
4842 'the try server waterfall for the builders name and the tests '
4843 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004844 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004845 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00004846 help=('Buildbucket bucket to send the try requests. Format: '
4847 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07004848 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004849 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004850 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004851 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004852 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00004853 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004854 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004855 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004856 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004857 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004858 '-q',
4859 '--quick-run',
4860 action='store_true',
4861 default=False,
4862 help='trigger in quick run mode '
4863 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
4864 'uick_run.md) (chromium only).')
4865 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004866 '--category', default='git_cl_try', help='Specify custom build category.')
4867 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004868 '--project',
4869 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004870 'in recipe to determine to which repository or directory to '
4871 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004872 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004873 '-p', '--property', dest='properties', action='append', default=[],
4874 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004875 'key2=value2 etc. The value will be treated as '
4876 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004877 'NOTE: using this may make your tryjob not usable for CQ, '
4878 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004879 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004880 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4881 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004882 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004883 parser.add_option(
4884 '-R', '--retry-failed', action='store_true', default=False,
4885 help='Retry failed jobs from the latest set of tryjobs. '
4886 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00004887 parser.add_option(
4888 '-i', '--issue', type=int,
4889 help='Operate on this issue instead of the current branch\'s implicit '
4890 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004891 options, args = parser.parse_args(args)
4892
machenbach@chromium.org45453142015-09-15 08:45:22 +00004893 # Make sure that all properties are prop=value pairs.
4894 bad_params = [x for x in options.properties if '=' not in x]
4895 if bad_params:
4896 parser.error('Got properties with missing "=": %s' % bad_params)
4897
maruel@chromium.org15192402012-09-06 12:38:29 +00004898 if args:
4899 parser.error('Unknown arguments: %s' % args)
4900
Edward Lemur934836a2019-09-09 20:16:54 +00004901 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004902 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004903 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004904
Edward Lemurf38bc172019-09-03 21:02:13 +00004905 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004906 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004907
tandriie113dfd2016-10-11 10:20:12 -07004908 error_message = cl.CannotTriggerTryJobReason()
4909 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004910 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004911
Edward Lemur45768512020-03-02 19:03:14 +00004912 if options.bot:
4913 if options.retry_failed:
4914 parser.error('--bot is not compatible with --retry-failed.')
4915 if not options.bucket:
4916 parser.error('A bucket (e.g. "chromium/try") is required.')
4917
4918 triggered = [b for b in options.bot if 'triggered' in b]
4919 if triggered:
4920 parser.error(
4921 'Cannot schedule builds on triggered bots: %s.\n'
4922 'This type of bot requires an initial job from a parent (usually a '
4923 'builder). Schedule a job on the parent instead.\n' % triggered)
4924
4925 if options.bucket.startswith('.master'):
4926 parser.error('Buildbot masters are not supported.')
4927
4928 project, bucket = _parse_bucket(options.bucket)
4929 if project is None or bucket is None:
4930 parser.error('Invalid bucket: %s.' % options.bucket)
4931 jobs = sorted((project, bucket, bot) for bot in options.bot)
4932 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004933 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004934 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004935 if options.verbose:
4936 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00004937 jobs = _filter_failed_for_retry(builds)
4938 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00004939 print('There are no failed jobs in the latest set of jobs '
4940 '(patchset #%d), doing nothing.' % patchset)
4941 return 0
Edward Lemur45768512020-03-02 19:03:14 +00004942 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004943 if num_builders > 10:
4944 confirm_or_exit('There are %d builders with failed builds.'
4945 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004946 elif options.quick_run:
4947 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
4948 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004949 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07004950 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004951 print('git cl try with no bots now defaults to CQ dry run.')
4952 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4953 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004954
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004955 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004956 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00004957 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004958 except BuildbucketResponseException as ex:
4959 print('ERROR: %s' % ex)
4960 return 1
4961 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004962
4963
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004964@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004965def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004966 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004967 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004968 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004969 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004970 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004971 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004972 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004973 '--color', action='store_true', default=setup_color.IS_TTY,
4974 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004975 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004976 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4977 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004978 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004979 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004980 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004981 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00004982 parser.add_option(
4983 '-i', '--issue', type=int,
4984 help='Operate on this issue instead of the current branch\'s implicit '
4985 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004986 options, args = parser.parse_args(args)
4987 if args:
4988 parser.error('Unrecognized args: %s' % ' '.join(args))
4989
Edward Lemur934836a2019-09-09 20:16:54 +00004990 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004991 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004992 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004993
tandrii221ab252016-10-06 08:12:04 -07004994 patchset = options.patchset
4995 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00004996 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07004997 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004998 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004999 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005000 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005001 cl.GetIssue())
5002
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005003 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005004 jobs = _fetch_tryjobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005005 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005006 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005007 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005008 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005009 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005010 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005011 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005012 return 0
5013
5014
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005015@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005016@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005017def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005018 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005019 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005020 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005021 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005022
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005023 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005024 if args:
5025 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005026 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005027 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005028 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005029 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005030
5031 # Clear configured merge-base, if there is one.
5032 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005033 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005034 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005035 return 0
5036
5037
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005038@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005039def CMDweb(parser, args):
5040 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005041 parser.add_option('-p',
5042 '--print-only',
5043 action='store_true',
5044 dest='print_only',
5045 help='Only print the Gerrit URL, don\'t open it in the '
5046 'browser.')
5047 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005048 if args:
5049 parser.error('Unrecognized args: %s' % ' '.join(args))
5050
5051 issue_url = Changelist().GetIssueURL()
5052 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005053 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005054 return 1
5055
Orr Bernstein0b960582022-12-22 20:16:18 +00005056 if options.print_only:
5057 print(issue_url)
5058 return 0
5059
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005060 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005061 # allows us to hide the "Created new window in existing browser session."
5062 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005063 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005064 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005065 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005066 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005067 os.open(os.devnull, os.O_RDWR)
5068 try:
5069 webbrowser.open(issue_url)
5070 finally:
5071 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005072 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005073 return 0
5074
5075
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005076@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005077def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005078 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005079 parser.add_option('-d', '--dry-run', action='store_true',
5080 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005081 parser.add_option(
5082 '-q',
5083 '--quick-run',
5084 action='store_true',
5085 help='trigger in quick run mode '
5086 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5087 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005088 parser.add_option('-c', '--clear', action='store_true',
5089 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005090 parser.add_option(
5091 '-i', '--issue', type=int,
5092 help='Operate on this issue instead of the current branch\'s implicit '
5093 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005094 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005095 if args:
5096 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005097 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5098 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005099
Edward Lemur934836a2019-09-09 20:16:54 +00005100 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005101 if not cl.GetIssue():
5102 parser.error('Must upload the issue first.')
5103
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005104 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005105 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005106 elif options.quick_run:
5107 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005108 elif options.dry_run:
5109 state = _CQState.DRY_RUN
5110 else:
5111 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005112 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005113 return 0
5114
5115
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005116@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005117def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005118 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005119 parser.add_option(
5120 '-i', '--issue', type=int,
5121 help='Operate on this issue instead of the current branch\'s implicit '
5122 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005123 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005124 if args:
5125 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005126 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005127 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005128 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005129 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005130 cl.CloseIssue()
5131 return 0
5132
5133
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005134@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005135def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005136 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005137 parser.add_option(
5138 '--stat',
5139 action='store_true',
5140 dest='stat',
5141 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005142 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005143 if args:
5144 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005145
Edward Lemur934836a2019-09-09 20:16:54 +00005146 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005147 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005148 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005149 if not issue:
5150 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005151
Gavin Makbe2e9262022-11-08 23:41:55 +00005152 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005153 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005154 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005155 if not base:
5156 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5157 revision_info = detail['revisions'][detail['current_revision']]
5158 fetch_info = revision_info['fetch']['http']
5159 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5160 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005161
Aaron Gablea718c3e2017-08-28 17:47:28 -07005162 cmd = ['git', 'diff']
5163 if options.stat:
5164 cmd.append('--stat')
5165 cmd.append(base)
5166 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005167
5168 return 0
5169
5170
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005171@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005172def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005173 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005174 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005175 '--ignore-current',
5176 action='store_true',
5177 help='Ignore the CL\'s current reviewers and start from scratch.')
5178 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005179 '--ignore-self',
5180 action='store_true',
5181 help='Do not consider CL\'s author as an owners.')
5182 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005183 '--no-color',
5184 action='store_true',
5185 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005186 parser.add_option(
5187 '--batch',
5188 action='store_true',
5189 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005190 # TODO: Consider moving this to another command, since other
5191 # git-cl owners commands deal with owners for a given CL.
5192 parser.add_option(
5193 '--show-all',
5194 action='store_true',
5195 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005196 options, args = parser.parse_args(args)
5197
Edward Lemur934836a2019-09-09 20:16:54 +00005198 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005199 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005200
Yang Guo6e269a02019-06-26 11:17:02 +00005201 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005202 if len(args) == 0:
5203 print('No files specified for --show-all. Nothing to do.')
5204 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005205 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005206 for path in args:
5207 print('Owners for %s:' % path)
5208 print('\n'.join(
5209 ' - %s' % owner
5210 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005211 return 0
5212
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005213 if args:
5214 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005215 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005216 base_branch = args[0]
5217 else:
5218 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005219 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005220
Edward Lemur2c62b332020-03-12 22:12:33 +00005221 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005222
5223 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005224 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5225 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005226 return 0
5227
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005228 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005229 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005230 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005231 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005232 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005233 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005234 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005235
5236
Aiden Bennerc08566e2018-10-03 17:52:42 +00005237def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005238 """Generates a diff command."""
5239 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005240 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5241
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005242 if allow_prefix:
5243 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5244 # case that diff.noprefix is set in the user's git config.
5245 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5246 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005247 diff_cmd += ['--no-prefix']
5248
5249 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005250
5251 if args:
5252 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005253 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005254 diff_cmd.append(arg)
5255 else:
5256 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005257
5258 return diff_cmd
5259
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005260
Jamie Madill5e96ad12020-01-13 16:08:35 +00005261def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5262 """Runs clang-format-diff and sets a return value if necessary."""
5263
5264 if not clang_diff_files:
5265 return 0
5266
5267 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5268 # formatted. This is used to block during the presubmit.
5269 return_value = 0
5270
5271 # Locate the clang-format binary in the checkout
5272 try:
5273 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5274 except clang_format.NotFoundError as e:
5275 DieWithError(e)
5276
5277 if opts.full or settings.GetFormatFullByDefault():
5278 cmd = [clang_format_tool]
5279 if not opts.dry_run and not opts.diff:
5280 cmd.append('-i')
5281 if opts.dry_run:
5282 for diff_file in clang_diff_files:
5283 with open(diff_file, 'r') as myfile:
5284 code = myfile.read().replace('\r\n', '\n')
5285 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5286 stdout = stdout.replace('\r\n', '\n')
5287 if opts.diff:
5288 sys.stdout.write(stdout)
5289 if code != stdout:
5290 return_value = 2
5291 else:
5292 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5293 if opts.diff:
5294 sys.stdout.write(stdout)
5295 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005296 try:
5297 script = clang_format.FindClangFormatScriptInChromiumTree(
5298 'clang-format-diff.py')
5299 except clang_format.NotFoundError as e:
5300 DieWithError(e)
5301
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005302 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005303 if not opts.dry_run and not opts.diff:
5304 cmd.append('-i')
5305
5306 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005307 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005308
Edward Lesmes89624cd2020-04-06 17:51:56 +00005309 env = os.environ.copy()
5310 env['PATH'] = (
5311 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5312 stdout = RunCommand(
5313 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005314 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005315 if opts.diff:
5316 sys.stdout.write(stdout)
5317 if opts.dry_run and len(stdout) > 0:
5318 return_value = 2
5319
5320 return return_value
5321
5322
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005323def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5324 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5325 presubmit checks have failed (and returns 0 otherwise)."""
5326
5327 if not rust_diff_files:
5328 return 0
5329
5330 # Locate the rustfmt binary.
5331 try:
5332 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5333 except rustfmt.NotFoundError as e:
5334 DieWithError(e)
5335
5336 # TODO(crbug.com/1231317): Support formatting only the changed lines
5337 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5338 # https://github.com/emilio/rustfmt-format-diff
5339 cmd = [rustfmt_tool]
5340 if opts.dry_run:
5341 cmd.append('--check')
5342 cmd += rust_diff_files
5343 rustfmt_exitcode = subprocess2.call(cmd)
5344
5345 if opts.presubmit and rustfmt_exitcode != 0:
5346 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005347
5348 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005349
5350
Olivier Robin0a6b5442022-04-07 07:25:04 +00005351def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5352 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5353 that presubmit checks have failed (and returns 0 otherwise)."""
5354
5355 if not swift_diff_files:
5356 return 0
5357
5358 # Locate the swift-format binary.
5359 try:
5360 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5361 except swift_format.NotFoundError as e:
5362 DieWithError(e)
5363
5364 cmd = [swift_format_tool]
5365 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005366 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005367 else:
5368 cmd += ['format', '-i']
5369 cmd += swift_diff_files
5370 swift_format_exitcode = subprocess2.call(cmd)
5371
5372 if opts.presubmit and swift_format_exitcode != 0:
5373 return 2
5374
5375 return 0
5376
5377
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005378def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005379 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005380 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005381
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005382
enne@chromium.org555cfe42014-01-29 18:21:39 +00005383@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005384@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005385def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005386 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005387 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005388 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005389 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005390 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005391 parser.add_option('--full', action='store_true',
5392 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005393 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005394 parser.add_option('--dry-run', action='store_true',
5395 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005396 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005397 '--no-clang-format',
5398 dest='clang_format',
5399 action='store_false',
5400 default=True,
5401 help='Disables formatting of various file types using clang-format.')
5402 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005403 '--python',
5404 action='store_true',
5405 default=None,
5406 help='Enables python formatting on all python files.')
5407 parser.add_option(
5408 '--no-python',
5409 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005410 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005411 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005412 'If neither --python or --no-python are set, python files that have a '
5413 '.style.yapf file in an ancestor directory will be formatted. '
5414 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005415 parser.add_option(
5416 '--js',
5417 action='store_true',
5418 help='Format javascript code with clang-format. '
5419 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005420 parser.add_option('--diff', action='store_true',
5421 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005422 parser.add_option('--presubmit', action='store_true',
5423 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005424
5425 parser.add_option('--rust-fmt',
5426 dest='use_rust_fmt',
5427 action='store_true',
5428 default=rustfmt.IsRustfmtSupported(),
5429 help='Enables formatting of Rust file types using rustfmt.')
5430 parser.add_option(
5431 '--no-rust-fmt',
5432 dest='use_rust_fmt',
5433 action='store_false',
5434 help='Disables formatting of Rust file types using rustfmt.')
5435
Olivier Robin0a6b5442022-04-07 07:25:04 +00005436 parser.add_option(
5437 '--swift-format',
5438 dest='use_swift_format',
5439 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005440 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005441 help='Enables formatting of Swift file types using swift-format '
5442 '(macOS host only).')
5443 parser.add_option(
5444 '--no-swift-format',
5445 dest='use_swift_format',
5446 action='store_false',
5447 help='Disables formatting of Swift file types using swift-format.')
5448
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005449 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005450
Garrett Beaty91a6f332020-01-06 16:57:24 +00005451 if opts.python is not None and opts.no_python:
5452 raise parser.error('Cannot set both --python and --no-python')
5453 if opts.no_python:
5454 opts.python = False
5455
Daniel Chengc55eecf2016-12-30 03:11:02 -08005456 # Normalize any remaining args against the current path, so paths relative to
5457 # the current directory are still resolved as expected.
5458 args = [os.path.join(os.getcwd(), arg) for arg in args]
5459
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005460 # git diff generates paths against the root of the repository. Change
5461 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005462 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005463 if rel_base_path:
5464 os.chdir(rel_base_path)
5465
digit@chromium.org29e47272013-05-17 17:01:46 +00005466 # Grab the merge-base commit, i.e. the upstream commit of the current
5467 # branch when it was created or the last time it was rebased. This is
5468 # to cover the case where the user may have called "git fetch origin",
5469 # moving the origin branch to a newer commit, but hasn't rebased yet.
5470 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005471 upstream_branch = opts.upstream
5472 if not upstream_branch:
5473 cl = Changelist()
5474 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005475 if upstream_branch:
5476 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5477 upstream_commit = upstream_commit.strip()
5478
5479 if not upstream_commit:
5480 DieWithError('Could not find base commit for this branch. '
5481 'Are you in detached state?')
5482
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005483 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5484 diff_output = RunGit(changed_files_cmd)
5485 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005486 # Filter out files deleted by this CL
5487 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005488
Andreas Haas417d89c2020-02-06 10:24:27 +00005489 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005490 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005491
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005492 clang_diff_files = []
5493 if opts.clang_format:
5494 clang_diff_files = [
5495 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5496 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005497 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005498 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005499 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005500 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005501
Edward Lesmes50da7702020-03-30 19:23:43 +00005502 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005503
Jamie Madill5e96ad12020-01-13 16:08:35 +00005504 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5505 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005506
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005507 if opts.use_rust_fmt:
5508 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5509 upstream_commit)
5510 if rust_fmt_return_value == 2:
5511 return_value = 2
5512
Olivier Robin0a6b5442022-04-07 07:25:04 +00005513 if opts.use_swift_format:
5514 if sys.platform != 'darwin':
5515 DieWithError('swift-format is only supported on macOS.')
5516 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5517 upstream_commit)
5518 if swift_format_return_value == 2:
5519 return_value = 2
5520
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005521 # Similar code to above, but using yapf on .py files rather than clang-format
5522 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005523 py_explicitly_disabled = opts.python is not None and not opts.python
5524 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005525 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5526 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005527
Aiden Bennerc08566e2018-10-03 17:52:42 +00005528 # Used for caching.
5529 yapf_configs = {}
5530 for f in python_diff_files:
5531 # Find the yapf style config for the current file, defaults to depot
5532 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005533 _FindYapfConfigFile(f, yapf_configs, top_dir)
5534
5535 # Turn on python formatting by default if a yapf config is specified.
5536 # This breaks in the case of this repo though since the specified
5537 # style file is also the global default.
5538 if opts.python is None:
5539 filtered_py_files = []
5540 for f in python_diff_files:
5541 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5542 filtered_py_files.append(f)
5543 else:
5544 filtered_py_files = python_diff_files
5545
5546 # Note: yapf still seems to fix indentation of the entire file
5547 # even if line ranges are specified.
5548 # See https://github.com/google/yapf/issues/499
5549 if not opts.full and filtered_py_files:
5550 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5551
Brian Sheedyb4307d52019-12-02 19:18:17 +00005552 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5553 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5554 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005555
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005556 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005557 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5558 # Default to pep8 if not .style.yapf is found.
5559 if not yapf_style:
5560 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005561
Peter Wend9399922020-06-17 17:33:49 +00005562 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005563 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005564 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005565 else:
5566 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00005567
5568 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005569
5570 has_formattable_lines = False
5571 if not opts.full:
5572 # Only run yapf over changed line ranges.
5573 for diff_start, diff_len in py_line_diffs[f]:
5574 diff_end = diff_start + diff_len - 1
5575 # Yapf errors out if diff_end < diff_start but this
5576 # is a valid line range diff for a removal.
5577 if diff_end >= diff_start:
5578 has_formattable_lines = True
5579 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5580 # If all line diffs were removals we have nothing to format.
5581 if not has_formattable_lines:
5582 continue
5583
5584 if opts.diff or opts.dry_run:
5585 cmd += ['--diff']
5586 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00005587 stdout = RunCommand(cmd,
5588 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00005589 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00005590 cwd=top_dir,
5591 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00005592 if opts.diff:
5593 sys.stdout.write(stdout)
5594 elif len(stdout) > 0:
5595 return_value = 2
5596 else:
5597 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00005598 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005599
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005600 # Format GN build files. Always run on full build files for canonical form.
5601 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005602 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005603 if opts.dry_run or opts.diff:
5604 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005605 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005606 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005607 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07005608 cwd=top_dir)
5609 if opts.dry_run and gn_ret == 2:
5610 return_value = 2 # Not formatted.
5611 elif opts.diff and gn_ret == 2:
5612 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005613 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005614 elif gn_ret != 0:
5615 # For non-dry run cases (and non-2 return values for dry-run), a
5616 # nonzero error code indicates a failure, probably because the file
5617 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005618 DieWithError('gn format failed on ' + gn_diff_file +
5619 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005620
Ilya Shermane081cbe2017-08-15 17:51:04 -07005621 # Skip the metrics formatting from the global presubmit hook. These files have
5622 # a separate presubmit hook that issues an error if the files need formatting,
5623 # whereas the top-level presubmit script merely issues a warning. Formatting
5624 # these files is somewhat slow, so it's important not to duplicate the work.
5625 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005626 for diff_xml in GetDiffXMLs(diff_files):
5627 xml_dir = GetMetricsDir(diff_xml)
5628 if not xml_dir:
5629 continue
5630
Ilya Shermane081cbe2017-08-15 17:51:04 -07005631 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005632 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00005633 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005634
5635 # If the XML file is histograms.xml or enums.xml, add the xml path to the
5636 # command as histograms/pretty_print.py now needs a relative path argument
5637 # after splitting the histograms into multiple directories.
5638 # For example, in tools/metrics/ukm, pretty-print could be run using:
5639 # $ python pretty_print.py
5640 # But in tools/metrics/histogrmas, pretty-print should be run with an
5641 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00005642 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005643 # $ python pretty_print.py enums.xml
5644
Weilun Shib92c4b72020-08-27 17:45:11 +00005645 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00005646 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005647 cmd.append(diff_xml)
5648
Ilya Shermane081cbe2017-08-15 17:51:04 -07005649 if opts.dry_run or opts.diff:
5650 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005651
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005652 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
5653 # `shell` param and instead replace `'vpython'` with
5654 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005655 stdout = RunCommand(cmd,
5656 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005657 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07005658 if opts.diff:
5659 sys.stdout.write(stdout)
5660 if opts.dry_run and stdout:
5661 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005662
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005663 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005664
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005665
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005666def GetDiffXMLs(diff_files):
5667 return [
5668 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
5669 ]
5670
5671
5672def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07005673 metrics_xml_dirs = [
5674 os.path.join('tools', 'metrics', 'actions'),
5675 os.path.join('tools', 'metrics', 'histograms'),
5676 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00005677 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005678 os.path.join('tools', 'metrics', 'ukm'),
5679 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005680 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00005681 if diff_xml.startswith(xml_dir):
5682 return xml_dir
5683 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07005684
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005685
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005686@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005687@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005688def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005689 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005690 _, args = parser.parse_args(args)
5691
5692 if len(args) != 1:
5693 parser.print_help()
5694 return 1
5695
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005696 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005697 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005698 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005699
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005700 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005701
Edward Lemur52969c92020-02-06 18:15:28 +00005702 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00005703 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00005704 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005705
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005706 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00005707 for key, issue in [x.split() for x in output.splitlines()]:
5708 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00005709 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00005710
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005711 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005712 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005713 return 1
5714 if len(branches) == 1:
5715 RunGit(['checkout', branches[0]])
5716 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005717 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005718 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005719 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00005720 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005721 try:
5722 RunGit(['checkout', branches[int(which)]])
5723 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005724 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005725 return 1
5726
5727 return 0
5728
5729
maruel@chromium.org29404b52014-09-08 22:58:00 +00005730def CMDlol(parser, args):
5731 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005732 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005733 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5734 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5735 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00005736 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005737 return 0
5738
5739
Josip Sokcevic0399e172022-03-21 23:11:51 +00005740def CMDversion(parser, args):
5741 import utils
5742 print(utils.depot_tools_version())
5743
5744
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005745class OptionParser(optparse.OptionParser):
5746 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00005747
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005748 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005749 optparse.OptionParser.__init__(
5750 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005751 self.add_option(
5752 '-v', '--verbose', action='count', default=0,
5753 help='Use 2 times for more debugging info')
5754
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005755 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005756 try:
5757 return self._parse_args(args)
5758 finally:
5759 # Regardless of success or failure of args parsing, we want to report
5760 # metrics, but only after logging has been initialized (if parsing
5761 # succeeded).
5762 global settings
5763 settings = Settings()
5764
Edward Lesmes9c349062021-05-06 20:02:39 +00005765 if metrics.collector.config.should_collect_metrics:
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005766 # GetViewVCUrl ultimately calls logging method.
5767 project_url = settings.GetViewVCUrl().strip('/+')
5768 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5769 metrics.collector.add('project_urls', [project_url])
5770
5771 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005772 # Create an optparse.Values object that will store only the actual passed
5773 # options, without the defaults.
5774 actual_options = optparse.Values()
5775 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5776 # Create an optparse.Values object with the default options.
5777 options = optparse.Values(self.get_default_values().__dict__)
5778 # Update it with the options passed by the user.
5779 options._update_careful(actual_options.__dict__)
5780 # Store the options passed by the user in an _actual_options attribute.
5781 # We store only the keys, and not the values, since the values can contain
5782 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005783 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005784
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005785 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005786 logging.basicConfig(
5787 level=levels[min(options.verbose, len(levels) - 1)],
5788 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5789 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005790
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005791 return options, args
5792
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005793
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005794def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005795 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005796 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005797 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005798 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005799
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005800 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005801 dispatcher = subcommand.CommandDispatcher(__name__)
5802 try:
5803 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005804 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005805 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005806 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005807 if e.code != 500:
5808 raise
5809 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005810 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005811 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005812 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005813
5814
5815if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005816 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5817 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005818 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005819 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005820 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005821 sys.exit(main(sys.argv[1:]))