blob: 1468f70d922a8cb3a6d04b29571ddcf286cc2a29 [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
Josip Sokcevic7958e302023-03-01 23:02:21 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +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
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Joanna Wang892f2ce2023-03-14 21:39:47 +0000165# Environment variable to indicate if user is participating in the stcked
166# changes dogfood.
167DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
168
169
Joanna Wang5051ffe2023-03-01 22:24:07 +0000170# Repo prefixes that are enrolled in the stacked changes dogfood.
171DOGFOOD_STACKED_CHANGES_REPOS = [
172 'chromium.googlesource.com/infra/',
173 'chrome-internal.googlesource.com/infra/'
174]
175
176
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000177class GitPushError(Exception):
178 pass
179
180
Christopher Lamf732cd52017-01-24 12:40:11 +1100181def DieWithError(message, change_desc=None):
182 if change_desc:
183 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000184 print('\n ** Content of CL description **\n' +
185 '='*72 + '\n' +
186 change_desc.description + '\n' +
187 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100188
vapiera7fbd5a2016-06-16 09:17:49 -0700189 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000190 sys.exit(1)
191
192
Christopher Lamf732cd52017-01-24 12:40:11 +1100193def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000194 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000195 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000196 with open(backup_path, 'wb') as backup_file:
197 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100198
199
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000200def GetNoGitPagerEnv():
201 env = os.environ.copy()
202 # 'cat' is a magical git string that disables pagers on all platforms.
203 env['GIT_PAGER'] = 'cat'
204 return env
205
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000206
bsep@chromium.org627d9002016-04-29 00:00:52 +0000207def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000208 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000209 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
210 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000211 except subprocess2.CalledProcessError as e:
212 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000213 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000214 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
215 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000216 out = e.stdout.decode('utf-8', 'replace')
217 if e.stderr:
218 out += e.stderr.decode('utf-8', 'replace')
219 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000220
221
222def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000223 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000224 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000225
226
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000227def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000228 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700229 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000230 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700231 else:
232 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000233 try:
tandrii5d48c322016-08-18 16:19:37 -0700234 (out, _), code = subprocess2.communicate(['git'] + args,
235 env=GetNoGitPagerEnv(),
236 stdout=subprocess2.PIPE,
237 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000238 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700239 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900240 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000241 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000242
243
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000244def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000245 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000246 return RunGitWithCode(args, suppress_stderr=True)[1]
247
248
tandrii2a16b952016-10-19 07:09:44 -0700249def time_sleep(seconds):
250 # Use this so that it can be mocked in tests without interfering with python
251 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700252 return time.sleep(seconds)
253
254
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000255def time_time():
256 # Use this so that it can be mocked in tests without interfering with python
257 # system machinery.
258 return time.time()
259
260
Edward Lemur1b52d872019-05-09 21:12:12 +0000261def datetime_now():
262 # Use this so that it can be mocked in tests without interfering with python
263 # system machinery.
264 return datetime.datetime.now()
265
266
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100267def confirm_or_exit(prefix='', action='confirm'):
268 """Asks user to press enter to continue or press Ctrl+C to abort."""
269 if not prefix or prefix.endswith('\n'):
270 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100271 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272 mid = ' Press'
273 elif prefix.endswith(' '):
274 mid = 'press'
275 else:
276 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000277 gclient_utils.AskForData(
278 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100279
280
281def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000282 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000283 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100284 while True:
285 if 'yes'.startswith(result):
286 return True
287 if 'no'.startswith(result):
288 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000289 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100290
291
machenbach@chromium.org45453142015-09-15 08:45:22 +0000292def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000293 prop_list = getattr(options, 'properties', [])
294 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000295 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000296 try:
297 properties[key] = json.loads(val)
298 except ValueError:
299 pass # If a value couldn't be evaluated, treat it as a string.
300 return properties
301
302
Edward Lemur4c707a22019-09-24 21:13:43 +0000303def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000304 """Calls a buildbucket v2 method and returns the parsed json response."""
305 headers = {
306 'Accept': 'application/json',
307 'Content-Type': 'application/json',
308 }
309 request = json.dumps(request)
310 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
311
312 logging.info('POST %s with %s' % (url, request))
313
314 attempts = 1
315 time_to_sleep = 1
316 while True:
317 response, content = http.request(url, 'POST', body=request, headers=headers)
318 if response.status == 200:
319 return json.loads(content[4:])
320 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
321 msg = '%s error when calling POST %s with %s: %s' % (
322 response.status, url, request, content)
323 raise BuildbucketResponseException(msg)
324 logging.debug(
325 '%s error when calling POST %s with %s. '
326 'Sleeping for %d seconds and retrying...' % (
327 response.status, url, request, time_to_sleep))
328 time.sleep(time_to_sleep)
329 time_to_sleep *= 2
330 attempts += 1
331
332 assert False, 'unreachable'
333
334
Edward Lemur6215c792019-10-03 21:59:05 +0000335def _parse_bucket(raw_bucket):
336 legacy = True
337 project = bucket = None
338 if '/' in raw_bucket:
339 legacy = False
340 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000341 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000342 elif raw_bucket.startswith('luci.'):
343 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000344 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000345 elif '.' in raw_bucket:
346 project = raw_bucket.split('.')[0]
347 bucket = raw_bucket
348 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000349 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000350 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
351 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000352
353
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000354def _canonical_git_googlesource_host(host):
355 """Normalizes Gerrit hosts (with '-review') to Git host."""
356 assert host.endswith(_GOOGLESOURCE)
357 # Prefix doesn't include '.' at the end.
358 prefix = host[:-(1 + len(_GOOGLESOURCE))]
359 if prefix.endswith('-review'):
360 prefix = prefix[:-len('-review')]
361 return prefix + '.' + _GOOGLESOURCE
362
363
364def _canonical_gerrit_googlesource_host(host):
365 git_host = _canonical_git_googlesource_host(host)
366 prefix = git_host.split('.', 1)[0]
367 return prefix + '-review.' + _GOOGLESOURCE
368
369
370def _get_counterpart_host(host):
371 assert host.endswith(_GOOGLESOURCE)
372 git = _canonical_git_googlesource_host(host)
373 gerrit = _canonical_gerrit_googlesource_host(git)
374 return git if gerrit == host else gerrit
375
376
Quinten Yearsley777660f2020-03-04 23:37:06 +0000377def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000378 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700379
380 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000381 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000382 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700383 options: Command-line options.
384 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000385 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000386 for project, bucket, builder in jobs:
387 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000388 print('To see results here, run: git cl try-results')
389 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700390
Quinten Yearsley777660f2020-03-04 23:37:06 +0000391 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000392 if not requests:
393 return
394
Edward Lemur5b929a42019-10-21 17:57:39 +0000395 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000396 http.force_exception_to_status_code = True
397
398 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000399 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
400 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000401
402 errors = [
403 ' ' + response['error']['message']
404 for response in batch_response.get('responses', [])
405 if 'error' in response
406 ]
407 if errors:
408 raise BuildbucketResponseException(
409 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
410
411
Quinten Yearsley777660f2020-03-04 23:37:06 +0000412def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000413 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000414 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000415 shared_properties = {
416 'category': options.ensure_value('category', 'git_cl_try')
417 }
418 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000419 shared_properties['clobber'] = True
420 shared_properties.update(_get_properties_from_options(options) or {})
421
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000422 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000423 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000424 shared_tags.append({'key': 'retry_failed',
425 'value': '1'})
426
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000427 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000428 for (project, bucket, builder) in jobs:
429 properties = shared_properties.copy()
430 if 'presubmit' in builder.lower():
431 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000432
Edward Lemur45768512020-03-02 19:03:14 +0000433 requests.append({
434 'scheduleBuild': {
435 'requestId': str(uuid.uuid4()),
436 'builder': {
437 'project': getattr(options, 'project', None) or project,
438 'bucket': bucket,
439 'builder': builder,
440 },
441 'gerritChanges': gerrit_changes,
442 'properties': properties,
443 'tags': [
444 {'key': 'builder', 'value': builder},
445 ] + shared_tags,
446 }
447 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000448
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000449 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000450 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000451 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000452 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000453 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000454 'id': options.revision,
455 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000456 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000457
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000458 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000459
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000460
Quinten Yearsley777660f2020-03-04 23:37:06 +0000461def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000462 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000463
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000464 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000465 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000466 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000467 request = {
468 'predicate': {
469 'gerritChanges': [changelist.GetGerritChange(patchset)],
470 },
471 'fields': ','.join('builds.*.' + field for field in fields),
472 }
tandrii221ab252016-10-06 08:12:04 -0700473
Edward Lemur5b929a42019-10-21 17:57:39 +0000474 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 if authenticator.has_cached_credentials():
476 http = authenticator.authorize(httplib2.Http())
477 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700478 print('Warning: Some results might be missing because %s' %
479 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000480 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000481 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000482 http.force_exception_to_status_code = True
483
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000484 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
485 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486
Edward Lemur45768512020-03-02 19:03:14 +0000487
Edward Lemur5b929a42019-10-21 17:57:39 +0000488def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000489 """Fetches builds from the latest patchset that has builds (within
490 the last few patchsets).
491
492 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 changelist (Changelist): The CL to fetch builds for
494 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000495 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
496 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000497 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000498 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
499 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000500 """
501 assert buildbucket_host
502 assert changelist.GetIssue(), 'CL must be uploaded first'
503 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000504 if latest_patchset is None:
505 assert changelist.GetMostRecentPatchset()
506 ps = changelist.GetMostRecentPatchset()
507 else:
508 assert latest_patchset > 0, latest_patchset
509 ps = latest_patchset
510
Quinten Yearsley983111f2019-09-26 17:18:48 +0000511 min_ps = max(1, ps - 5)
512 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000513 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000514 if len(builds):
515 return builds, ps
516 ps -= 1
517 return [], 0
518
519
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000520def _filter_failed_for_retry(all_builds):
521 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000522
523 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000524 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000525 i.e. a list of buildbucket.v2.Builds which includes status and builder
526 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000527
528 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000529 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000530 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000531 """
Edward Lemur45768512020-03-02 19:03:14 +0000532 grouped = {}
533 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000534 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000535 key = (builder['project'], builder['bucket'], builder['builder'])
536 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537
Edward Lemur45768512020-03-02 19:03:14 +0000538 jobs = []
539 for (project, bucket, builder), builds in grouped.items():
540 if 'triggered' in builder:
541 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
542 'from a parent. Please schedule a manual job for the parent '
543 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000544 continue
545 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
546 # Don't retry if any are running.
547 continue
Edward Lemur45768512020-03-02 19:03:14 +0000548 # If builder had several builds, retry only if the last one failed.
549 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
550 # build, but in case of retrying failed jobs retrying a flaky one makes
551 # sense.
552 builds = sorted(builds, key=lambda b: b['createTime'])
553 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
554 continue
555 # Don't retry experimental build previously triggered by CQ.
556 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
557 for t in builds[-1]['tags']):
558 continue
559 jobs.append((project, bucket, builder))
560
561 # Sort the jobs to make testing easier.
562 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000563
564
Quinten Yearsley777660f2020-03-04 23:37:06 +0000565def _print_tryjobs(options, builds):
566 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000568 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 return
570
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000571 longest_builder = max(len(b['builder']['builder']) for b in builds)
572 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000573 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000574 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
575 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000577 builds_by_status = {}
578 for b in builds:
579 builds_by_status.setdefault(b['status'], []).append({
580 'id': b['id'],
581 'name': name_fmt.format(
582 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
583 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 sort_key = lambda b: (b['name'], b['id'])
586
587 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000589 if not builds:
590 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000591
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000593 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000594 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 else:
596 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
597
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000598 print(colorize(title))
599 for b in sorted(builds, key=sort_key):
600 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601
602 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000603 print_builds(
604 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
605 print_builds(
606 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
607 color=Fore.MAGENTA)
608 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
609 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
610 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000611 print_builds('Started:', builds_by_status.pop('STARTED', []),
612 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000613 print_builds(
614 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000616 print_builds(
617 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000618 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000619
620
Aiden Bennerc08566e2018-10-03 17:52:42 +0000621def _ComputeDiffLineRanges(files, upstream_commit):
622 """Gets the changed line ranges for each file since upstream_commit.
623
624 Parses a git diff on provided files and returns a dict that maps a file name
625 to an ordered list of range tuples in the form (start_line, count).
626 Ranges are in the same format as a git diff.
627 """
628 # If files is empty then diff_output will be a full diff.
629 if len(files) == 0:
630 return {}
631
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000632 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000633 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000634 diff_output = RunGit(diff_cmd)
635
636 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
637 # 2 capture groups
638 # 0 == fname of diff file
639 # 1 == 'diff_start,diff_count' or 'diff_start'
640 # will match each of
641 # diff --git a/foo.foo b/foo.py
642 # @@ -12,2 +14,3 @@
643 # @@ -12,2 +17 @@
644 # running re.findall on the above string with pattern will give
645 # [('foo.py', ''), ('', '14,3'), ('', '17')]
646
647 curr_file = None
648 line_diffs = {}
649 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
650 if match[0] != '':
651 # Will match the second filename in diff --git a/a.py b/b.py.
652 curr_file = match[0]
653 line_diffs[curr_file] = []
654 else:
655 # Matches +14,3
656 if ',' in match[1]:
657 diff_start, diff_count = match[1].split(',')
658 else:
659 # Single line changes are of the form +12 instead of +12,1.
660 diff_start = match[1]
661 diff_count = 1
662
663 diff_start = int(diff_start)
664 diff_count = int(diff_count)
665
666 # If diff_count == 0 this is a removal we can ignore.
667 line_diffs[curr_file].append((diff_start, diff_count))
668
669 return line_diffs
670
671
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 """Checks if a yapf file is in any parent directory of fpath until top_dir.
674
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000675 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000676 is found returns None. Uses yapf_config_cache as a cache for previously found
677 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000678 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000679 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 # Return result if we've already computed it.
681 if fpath in yapf_config_cache:
682 return yapf_config_cache[fpath]
683
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000684 parent_dir = os.path.dirname(fpath)
685 if os.path.isfile(fpath):
686 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000687 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000688 # Otherwise fpath is a directory
689 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
690 if os.path.isfile(yapf_file):
691 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000692 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000693 # If we're at the top level directory, or if we're at root
694 # there is no provided style.
695 ret = None
696 else:
697 # Otherwise recurse on the current directory.
698 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000699 yapf_config_cache[fpath] = ret
700 return ret
701
702
Brian Sheedyb4307d52019-12-02 19:18:17 +0000703def _GetYapfIgnorePatterns(top_dir):
704 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000705
706 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
707 but this functionality appears to break when explicitly passing files to
708 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000709 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000710 the .yapfignore file should be in the directory that yapf is invoked from,
711 which we assume to be the top level directory in this case.
712
713 Args:
714 top_dir: The top level directory for the repository being formatted.
715
716 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000717 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000718 """
719 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000720 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000721 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000722 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000723
Anthony Politoc64e3902021-04-30 21:55:25 +0000724 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
725 stripped_line = line.strip()
726 # Comments and blank lines should be ignored.
727 if stripped_line.startswith('#') or stripped_line == '':
728 continue
729 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000730 return ignore_patterns
731
732
733def _FilterYapfIgnoredFiles(filepaths, patterns):
734 """Filters out any filepaths that match any of the given patterns.
735
736 Args:
737 filepaths: An iterable of strings containing filepaths to filter.
738 patterns: An iterable of strings containing fnmatch patterns to filter on.
739
740 Returns:
741 A list of strings containing all the elements of |filepaths| that did not
742 match any of the patterns in |patterns|.
743 """
744 # Not inlined so that tests can use the same implementation.
745 return [f for f in filepaths
746 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000747
748
Aaron Gable13101a62018-02-09 13:20:41 -0800749def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000750 """Prints statistics about the change to the user."""
751 # --no-ext-diff is broken in some versions of Git, so try to work around
752 # this by overriding the environment (but there is still a problem if the
753 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000754 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000755 if 'GIT_EXTERNAL_DIFF' in env:
756 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000757
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800759 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000760 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000761
762
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000763class BuildbucketResponseException(Exception):
764 pass
765
766
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000767class Settings(object):
768 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000770 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000771 self.tree_status_url = None
772 self.viewvc_url = None
773 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000774 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000775 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000776 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000777 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000778 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000779 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000780
Edward Lemur26964072020-02-19 19:18:51 +0000781 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000782 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000783 if self.updated:
784 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000785
Edward Lemur26964072020-02-19 19:18:51 +0000786 # The only value that actually changes the behavior is
787 # autoupdate = "false". Everything else means "true".
788 autoupdate = (
789 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
790
791 cr_settings_file = FindCodereviewSettingsFile()
792 if autoupdate != 'false' and cr_settings_file:
793 LoadCodereviewSettingsFromFile(cr_settings_file)
794 cr_settings_file.close()
795
796 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000798 @staticmethod
799 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000800 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000803 if self.root is None:
804 self.root = os.path.abspath(self.GetRelativeRoot())
805 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 def GetTreeStatusUrl(self, error_ok=False):
808 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000809 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
810 if self.tree_status_url is None and not error_ok:
811 DieWithError(
812 'You must configure your tree status URL by running '
813 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 return self.tree_status_url
815
816 def GetViewVCUrl(self):
817 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000818 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000819 return self.viewvc_url
820
rmistry@google.com90752582014-01-14 21:04:50 +0000821 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000822 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000823
rmistry@google.com5626a922015-02-26 14:03:30 +0000824 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000825 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000826 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000827 return run_post_upload_hook == "True"
828
Joanna Wangc8f23e22023-01-19 21:18:10 +0000829 def GetDefaultCCList(self):
830 return self._GetConfig('rietveld.cc')
831
Dirk Pranke6f0df682021-06-25 00:42:33 +0000832 def GetUsePython3(self):
833 return self._GetConfig('rietveld.use-python3')
834
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000836 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000837 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000838 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
839 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000840 # Default is squash now (http://crbug.com/611892#c23).
841 self.squash_gerrit_uploads = self._GetConfig(
842 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000843 return self.squash_gerrit_uploads
844
Edward Lesmes4de54132020-05-05 19:41:33 +0000845 def GetSquashGerritUploadsOverride(self):
846 """Return True or False if codereview.settings should be overridden.
847
848 Returns None if no override has been defined.
849 """
850 # See also http://crbug.com/611892#c23
851 result = self._GetConfig('gerrit.override-squash-uploads').lower()
852 if result == 'true':
853 return True
854 if result == 'false':
855 return False
856 return None
857
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000858 def GetIsGerrit(self):
859 """Return True if gerrit.host is set."""
860 if self.is_gerrit is None:
861 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
862 return self.is_gerrit
863
tandrii@chromium.org28253532016-04-14 13:46:56 +0000864 def GetGerritSkipEnsureAuthenticated(self):
865 """Return True if EnsureAuthenticated should not be done for Gerrit
866 uploads."""
867 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.gerrit_skip_ensure_authenticated = self._GetConfig(
869 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000870 return self.gerrit_skip_ensure_authenticated
871
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000873 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000875 # Git requires single quotes for paths with spaces. We need to replace
876 # them with double quotes for Windows to treat such paths as a single
877 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000878 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 return self.git_editor or None
880
thestig@chromium.org44202a22014-03-11 19:22:18 +0000881 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000882 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000883
884 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000885 return self._GetConfig(
886 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000887
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000888 def GetFormatFullByDefault(self):
889 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000890 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000891 result = (
892 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
893 error_ok=True).strip())
894 self.format_full_by_default = (result == 'true')
895 return self.format_full_by_default
896
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000897 def IsStatusCommitOrderByDate(self):
898 if self.is_status_commit_order_by_date is None:
899 result = (RunGit(['config', '--bool', 'cl.date-order'],
900 error_ok=True).strip())
901 self.is_status_commit_order_by_date = (result == 'true')
902 return self.is_status_commit_order_by_date
903
Edward Lemur26964072020-02-19 19:18:51 +0000904 def _GetConfig(self, key, default=''):
905 self._LazyUpdateIfNeeded()
906 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000907
908
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000909class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000910 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000911 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000912 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000913 DRY_RUN = 'dry_run'
914 COMMIT = 'commit'
915
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000916 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000917
918
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000919class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000920 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 self.issue = issue
922 self.patchset = patchset
923 self.hostname = hostname
924
925 @property
926 def valid(self):
927 return self.issue is not None
928
929
Edward Lemurf38bc172019-09-03 21:02:13 +0000930def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
932 fail_result = _ParsedIssueNumberArgument()
933
Edward Lemur678a6842019-10-03 22:25:05 +0000934 if isinstance(arg, int):
935 return _ParsedIssueNumberArgument(issue=arg)
936 if not isinstance(arg, basestring):
937 return fail_result
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000940 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700941
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000942 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000943 if not url.startswith('http'):
944 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000945 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
946 if url.startswith(short_url):
947 url = gerrit_url + url[len(short_url):]
948 break
949
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000950 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000951 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000952 except ValueError:
953 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200954
Alex Turner30ae6372022-01-04 02:32:52 +0000955 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
956 # URL.
957 if not arg.startswith('http') and '.' not in parsed_url.netloc:
958 return fail_result
959
Edward Lemur678a6842019-10-03 22:25:05 +0000960 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
961 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
962 # Short urls like https://domain/<issue_number> can be used, but don't allow
963 # specifying the patchset (you'd 404), but we allow that here.
964 if parsed_url.path == '/':
965 part = parsed_url.fragment
966 else:
967 part = parsed_url.path
968
969 match = re.match(
970 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
971 if not match:
972 return fail_result
973
974 issue = int(match.group('issue'))
975 patchset = match.group('patchset')
976 return _ParsedIssueNumberArgument(
977 issue=issue,
978 patchset=int(patchset) if patchset else None,
979 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000980
981
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000982def _create_description_from_log(args):
983 """Pulls out the commit log to use as a base for the CL description."""
984 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000985 if len(args) == 1 and args[0] == None:
986 # Handle the case where None is passed as the branch.
987 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000988 if len(args) == 1 and not args[0].endswith('.'):
989 log_args = [args[0] + '..']
990 elif len(args) == 1 and args[0].endswith('...'):
991 log_args = [args[0][:-1]]
992 elif len(args) == 2:
993 log_args = [args[0] + '..' + args[1]]
994 else:
995 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000996 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000997
998
Aaron Gablea45ee112016-11-22 15:14:38 -0800999class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001000 def __init__(self, issue, url):
1001 self.issue = issue
1002 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001003 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001004
1005 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001006 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001007 self.issue, self.url)
1008
1009
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001010_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001011 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001012 # TODO(tandrii): these two aren't known in Gerrit.
1013 'approval', 'disapproval'])
1014
1015
Joanna Wang6215dd02023-02-07 15:58:03 +00001016# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001017_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001018 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001019 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001020])
1021
1022
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001023class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 """Changelist works with one changelist in local branch.
1025
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001026 Notes:
1027 * Not safe for concurrent multi-{thread,process} use.
1028 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001029 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """
1031
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001032 def __init__(self,
1033 branchref=None,
1034 issue=None,
1035 codereview_host=None,
1036 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001037 """Create a new ChangeList instance.
1038
Edward Lemurf38bc172019-09-03 21:02:13 +00001039 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001040 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001042 global settings
1043 if not settings:
1044 # Happens when git_cl.py is used as a utility library.
1045 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001046
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.branchref = branchref
1048 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001049 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001050 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001051 else:
1052 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001053 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001054 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001055 self.lookedup_issue = False
1056 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001057 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001058 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001059 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001060 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001061 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001062 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001063 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001064
Edward Lemur125d60a2019-09-13 18:25:41 +00001065 # Lazily cached values.
1066 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1067 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001068 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001069 # Map from change number (issue) to its detail cache.
1070 self._detail_cache = {}
1071
1072 if codereview_host is not None:
1073 assert not codereview_host.startswith('https://'), codereview_host
1074 self._gerrit_host = codereview_host
1075 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076
Edward Lesmese1576912021-02-16 21:53:34 +00001077 @property
1078 def owners_client(self):
1079 if self._owners_client is None:
1080 remote, remote_branch = self.GetRemoteBranch()
1081 branch = GetTargetRef(remote, remote_branch, None)
1082 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001083 host=self.GetGerritHost(),
1084 project=self.GetGerritProject(),
1085 branch=branch)
1086 return self._owners_client
1087
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001088 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001089 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001090
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001091 The return value is a string suitable for passing to git cl with the --cc
1092 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001093 """
1094 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001095 base_cc = settings.GetDefaultCCList()
1096 more_cc = ','.join(self.more_cc)
1097 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001098 return self.cc
1099
Daniel Cheng7227d212017-11-17 08:12:37 -08001100 def ExtendCC(self, more_cc):
1101 """Extends the list of users to cc on this CL based on the changed files."""
1102 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001104 def GetCommitDate(self):
1105 """Returns the commit date as provided in the constructor"""
1106 return self.commit_date
1107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001109 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001111 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001112 if not branchref:
1113 return None
1114 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001115 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 return self.branch
1117
1118 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001119 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.GetBranch() # Poke the lazy loader.
1121 return self.branchref
1122
Edward Lemur85153282020-02-14 22:06:29 +00001123 def _GitGetBranchConfigValue(self, key, default=None):
1124 return scm.GIT.GetBranchConfig(
1125 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001126
Edward Lemur85153282020-02-14 22:06:29 +00001127 def _GitSetBranchConfigValue(self, key, value):
1128 action = 'set %s to %r' % (key, value)
1129 if not value:
1130 action = 'unset %s' % key
1131 assert self.GetBranch(), 'a branch is needed to ' + action
1132 return scm.GIT.SetBranchConfig(
1133 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001134
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 @staticmethod
1136 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001137 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001138 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001140 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1141 settings.GetRoot(), branch)
1142 if not remote or not upstream_branch:
1143 DieWithError(
1144 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001145 'Verify this branch is set up to track another \n'
1146 '(via the --track argument to "git checkout -b ..."). \n'
1147 'or pass complete "git diff"-style arguments if supported, like\n'
1148 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149
1150 return remote, upstream_branch
1151
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001153 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001154 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001155 DieWithError('The upstream for the current branch (%s) does not exist '
1156 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001157 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001158 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001160 def GetUpstreamBranch(self):
1161 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001163 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001164 upstream_branch = upstream_branch.replace('refs/heads/',
1165 'refs/remotes/%s/' % remote)
1166 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1167 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168 self.upstream_branch = upstream_branch
1169 return self.upstream_branch
1170
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, branch = None, self.GetBranch()
1174 seen_branches = set()
1175 while branch not in seen_branches:
1176 seen_branches.add(branch)
1177 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001178 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 if remote != '.' or branch.startswith('refs/remotes'):
1180 break
1181 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001182 remotes = RunGit(['remote'], error_ok=True).split()
1183 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001184 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001185 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001187 logging.warning('Could not determine which remote this change is '
1188 'associated with, so defaulting to "%s".' %
1189 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001190 else:
Gavin Make6a62332020-12-04 21:57:10 +00001191 logging.warning('Could not determine which remote this change is '
1192 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 branch = 'HEAD'
1194 if branch.startswith('refs/remotes'):
1195 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001196 elif branch.startswith('refs/branch-heads/'):
1197 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001198 else:
1199 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001200 return self._remote
1201
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001202 def GetRemoteUrl(self):
1203 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1204
1205 Returns None if there is no remote.
1206 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001207 is_cached, value = self._cached_remote_url
1208 if is_cached:
1209 return value
1210
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001211 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001212 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001213
Edward Lemur298f2cf2019-02-22 21:40:39 +00001214 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001215 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001216 if host:
1217 self._cached_remote_url = (True, url)
1218 return url
1219
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001220 # If it cannot be parsed as an url, assume it is a local directory,
1221 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 logging.warning('"%s" doesn\'t appear to point to a git host. '
1223 'Interpreting it as a local directory.', url)
1224 if not os.path.isdir(url):
1225 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001226 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1227 'but it doesn\'t exist.',
1228 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001229 return None
1230
1231 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001232 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001233
Edward Lemur79d4f992019-11-11 23:49:02 +00001234 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001235 if not host:
1236 logging.error(
1237 'Remote "%(remote)s" for branch "%(branch)s" points to '
1238 '"%(cache_path)s", but it is misconfigured.\n'
1239 '"%(cache_path)s" must be a git repo and must have a remote named '
1240 '"%(remote)s" pointing to the git host.', {
1241 'remote': remote,
1242 'cache_path': cache_path,
1243 'branch': self.GetBranch()})
1244 return None
1245
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001246 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001247 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001249 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001250 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001251 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001252 if self.GetBranch():
1253 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001254 if self.issue is not None:
1255 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001256 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 return self.issue
1258
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001259 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001261 issue = self.GetIssue()
1262 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001263 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001264 server = self.GetCodereviewServer()
1265 if short:
1266 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1267 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268
Dirk Pranke6f0df682021-06-25 00:42:33 +00001269 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001270 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001271
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272 def FetchDescription(self, pretty=False):
1273 assert self.GetIssue(), 'issue is required to query Gerrit'
1274
Edward Lemur9aa1a962020-02-25 00:58:38 +00001275 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001276 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1277 current_rev = data['current_revision']
1278 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001279
1280 if not pretty:
1281 return self.description
1282
1283 # Set width to 72 columns + 2 space indent.
1284 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1285 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1286 lines = self.description.splitlines()
1287 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288
1289 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001290 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001291 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001292 if self.GetBranch():
1293 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001294 if self.patchset is not None:
1295 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001296 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 return self.patchset
1298
Edward Lemur9aa1a962020-02-25 00:58:38 +00001299 def GetAuthor(self):
1300 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001302 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001303 """Set this branch's patchset. If patchset=0, clears the patchset."""
1304 assert self.GetBranch()
1305 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001306 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001307 else:
1308 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001310
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001311 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001312 """Set this branch's issue. If issue isn't given, clears the issue."""
1313 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001314 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001315 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001316 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001317 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001318 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001319 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001320 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001321 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001322 else:
tandrii5d48c322016-08-18 16:19:37 -07001323 # Reset all of these just to be clean.
1324 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001325 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001326 ISSUE_CONFIG_KEY,
1327 PATCHSET_CONFIG_KEY,
1328 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001329 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001330 ]
tandrii5d48c322016-08-18 16:19:37 -07001331 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001332 try:
1333 self._GitSetBranchConfigValue(prop, None)
1334 except subprocess2.CalledProcessError:
1335 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001336 msg = RunGit(['log', '-1', '--format=%B']).strip()
1337 if msg and git_footers.get_footer_change_id(msg):
1338 print('WARNING: The change patched into this branch has a Change-Id. '
1339 'Removing it.')
1340 RunGit(['commit', '--amend', '-m',
1341 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001342 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001343 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001344 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001345
Joanna Wangb46232e2023-01-21 01:58:46 +00001346 def GetAffectedFiles(self, upstream, end_commit=None):
1347 # type: (str, Optional[str]) -> Sequence[str]
1348 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001349 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001350 return [
1351 f for _, f in scm.GIT.CaptureStatus(
1352 settings.GetRoot(), upstream, end_commit=end_commit)
1353 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001354 except subprocess2.CalledProcessError:
1355 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001356 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001357 'This branch probably doesn\'t exist anymore. To reset the\n'
1358 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001359 ' git branch --set-upstream-to origin/main %s\n'
1360 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001361 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001362
dsansomee2d6fd92016-09-08 00:10:47 -07001363 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 assert self.GetIssue(), 'issue is required to update description'
1365
1366 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001367 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001368 if not force:
1369 confirm_or_exit(
1370 'The description cannot be modified while the issue has a pending '
1371 'unpublished edit. Either publish the edit in the Gerrit web UI '
1372 'or delete it.\n\n', action='delete the unpublished edit')
1373
1374 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001375 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001376 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001377 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001378 description, notify='NONE')
1379
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001380 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381
Edward Lemur75526302020-02-27 22:31:05 +00001382 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001383 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001384 '--root', settings.GetRoot(),
1385 '--upstream', upstream,
1386 ]
1387
1388 args.extend(['--verbose'] * verbose)
1389
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001390 remote, remote_branch = self.GetRemoteBranch()
1391 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001392 if settings.GetIsGerrit():
1393 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1394 args.extend(['--gerrit_project', self.GetGerritProject()])
1395 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001396
Edward Lemur99df04e2020-03-05 19:39:43 +00001397 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001398 issue = self.GetIssue()
1399 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001400 if author:
1401 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001402 if issue:
1403 args.extend(['--issue', str(issue)])
1404 if patchset:
1405 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001406
Edward Lemur75526302020-02-27 22:31:05 +00001407 return args
1408
Josip Sokcevic017544d2022-03-31 23:47:53 +00001409 def RunHook(self,
1410 committing,
1411 may_prompt,
1412 verbose,
1413 parallel,
1414 upstream,
1415 description,
1416 all_files,
1417 files=None,
1418 resultdb=False,
1419 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001420 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1421 args = self._GetCommonPresubmitArgs(verbose, upstream)
1422 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001423 if may_prompt:
1424 args.append('--may_prompt')
1425 if parallel:
1426 args.append('--parallel')
1427 if all_files:
1428 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001429 if files:
1430 args.extend(files.split(';'))
1431 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001432 if files or all_files:
1433 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001434
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001435 if resultdb and not realm:
1436 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1437 # it is not required to pass the realm flag
1438 print('Note: ResultDB reporting will NOT be performed because --realm'
1439 ' was not specified. To enable ResultDB, please run the command'
1440 ' again with the --realm argument to specify the LUCI realm.')
1441
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001442 py3_results = self._RunPresubmit(args,
1443 description,
1444 use_python3=True,
1445 resultdb=resultdb,
1446 realm=realm)
1447 if py3_results.get('skipped_presubmits', 1) == 0:
1448 print('No more presubmits to run - skipping Python 2 presubmits.')
1449 return py3_results
1450
1451 py2_results = self._RunPresubmit(args,
1452 description,
1453 use_python3=False,
1454 resultdb=resultdb,
1455 realm=realm)
1456 return self._MergePresubmitResults(py2_results, py3_results)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001457
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001458 def _RunPresubmit(self,
1459 args,
1460 description,
1461 use_python3,
1462 resultdb=None,
1463 realm=None):
1464 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1465 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001466 args = args[:]
1467 vpython = 'vpython3' if use_python3 else 'vpython'
1468
Edward Lemur227d5102020-02-25 23:45:35 +00001469 with gclient_utils.temporary_file() as description_file:
1470 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001471 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001472 args.extend(['--json_output', json_output])
1473 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001474 if self.GetUsePython3():
1475 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001476 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001477 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001478 if resultdb and realm:
1479 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001480
1481 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001482 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001483
Edward Lemur227d5102020-02-25 23:45:35 +00001484 metrics.collector.add_repeated('sub_commands', {
1485 'command': 'presubmit',
1486 'execution_time': time_time() - start,
1487 'exit_code': exit_code,
1488 })
1489
1490 if exit_code:
1491 sys.exit(exit_code)
1492
1493 json_results = gclient_utils.FileRead(json_output)
1494 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001495
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001496 def _MergePresubmitResults(self, py2_results, py3_results):
1497 return {
1498 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1499 py3_results.get('more_cc', []))),
1500 'errors': (
1501 py2_results.get('errors', []) + py3_results.get('errors', [])),
1502 'notifications': (
1503 py2_results.get('notifications', []) +
1504 py3_results.get('notifications', [])),
1505 'warnings': (
1506 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1507 }
1508
Brian Sheedy7326ca22022-11-02 18:36:17 +00001509 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001510 args = self._GetCommonPresubmitArgs(verbose, upstream)
1511 args.append('--post_upload')
1512
1513 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001514 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001515 args.extend(['--description_file', description_file])
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001516 if not py3_only:
1517 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1518 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1519 ['--use-python3'])
1520 if not py3_only:
1521 p_py2.wait()
1522 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001523
Edward Lemur5a644f82020-03-18 16:44:57 +00001524 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001525 # type: (optparse.Values, Sequence[str], Sequence[str]
1526 # ) -> ChangeDescription
1527 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001528 if self.GetIssue():
1529 description = self.FetchDescription()
1530 elif options.message:
1531 description = options.message
1532 else:
1533 description = _create_description_from_log(git_diff_args)
1534 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001535 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001536
Edward Lemur5a644f82020-03-18 16:44:57 +00001537 bug = options.bug
1538 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001539 if not self.GetIssue():
1540 # Extract bug number from branch name, but only if issue is being created.
1541 # It must start with bug or fix, followed by _ or - and number.
1542 # Optionally, it may contain _ or - after number with arbitrary text.
1543 # Examples:
1544 # bug-123
1545 # bug_123
1546 # fix-123
1547 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001548 branch = self.GetBranch()
1549 if branch is not None:
1550 match = re.match(
1551 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1552 if not bug and not fixed and match:
1553 if match.group('type') == 'bug':
1554 bug = match.group('bugnum')
1555 else:
1556 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001557
1558 change_description = ChangeDescription(description, bug, fixed)
1559
Joanna Wang39811b12023-01-20 23:09:48 +00001560 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001561 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001562 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001563 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001564 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001565 missing_files = [
1566 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001567 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001568 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001569 owners = self.owners_client.SuggestOwners(
1570 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001571 assert isinstance(options.reviewers, list), options.reviewers
1572 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001573
Edward Lemur5a644f82020-03-18 16:44:57 +00001574 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001575 if options.reviewers:
1576 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001577
1578 return change_description
1579
Joanna Wanga1abbed2023-01-24 01:41:05 +00001580 def _GetTitleForUpload(self, options, multi_change_upload=False):
1581 # type: (optparse.Values, Optional[bool]) -> str
1582
1583 # Getting titles for multipl commits is not supported so we return the
1584 # default.
1585 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001586 return options.title
1587
1588 # On first upload, patchset title is always this string, while options.title
1589 # gets converted to first line of message.
1590 if not self.GetIssue():
1591 return 'Initial upload'
1592
1593 # When uploading subsequent patchsets, options.message is taken as the title
1594 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001595 if options.message:
1596 return options.message.strip()
1597
1598 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001599 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001600 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001601 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001602 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001603
1604 # Use the default title if the user confirms the default with a 'y'.
1605 if user_title.lower() == 'y':
1606 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001607 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001608
Joanna Wang562481d2023-01-26 21:57:14 +00001609 def _GetRefSpecOptions(self,
1610 options,
1611 change_desc,
1612 multi_change_upload=False,
1613 dogfood_path=False):
1614 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1615 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001616
1617 # Extra options that can be specified at push time. Doc:
1618 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1619 refspec_opts = []
1620
1621 # By default, new changes are started in WIP mode, and subsequent patchsets
1622 # don't send email. At any time, passing --send-mail or --send-email will
1623 # mark the change ready and send email for that particular patch.
1624 if options.send_mail:
1625 refspec_opts.append('ready')
1626 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001627 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001628 refspec_opts.append('wip')
1629 else:
1630 refspec_opts.append('notify=NONE')
1631
1632 # TODO(tandrii): options.message should be posted as a comment if
1633 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1634 # to do it.
1635
1636 # Set options.title in case user was prompted in _GetTitleForUpload and
1637 # _CMDUploadChange needs to be called again.
1638 options.title = self._GetTitleForUpload(
1639 options, multi_change_upload=multi_change_upload)
1640
1641 if options.title:
1642 # Punctuation and whitespace in |title| must be percent-encoded.
1643 refspec_opts.append('m=' +
1644 gerrit_util.PercentEncodeForGitRef(options.title))
1645
1646 if options.private:
1647 refspec_opts.append('private')
1648
1649 if options.topic:
1650 # Documentation on Gerrit topics is here:
1651 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1652 refspec_opts.append('topic=%s' % options.topic)
1653
1654 if options.enable_auto_submit:
1655 refspec_opts.append('l=Auto-Submit+1')
1656 if options.set_bot_commit:
1657 refspec_opts.append('l=Bot-Commit+1')
1658 if options.use_commit_queue:
1659 refspec_opts.append('l=Commit-Queue+2')
1660 elif options.cq_dry_run:
1661 refspec_opts.append('l=Commit-Queue+1')
1662 elif options.cq_quick_run:
1663 refspec_opts.append('l=Commit-Queue+1')
1664 refspec_opts.append('l=Quick-Run+1')
1665
1666 if change_desc.get_reviewers(tbr_only=True):
1667 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1668 self.GetGerritProject())
1669 refspec_opts.append('l=Code-Review+%s' % score)
1670
Joanna Wang40497912023-01-24 21:18:16 +00001671 # Gerrit sorts hashtags, so order is not important.
1672 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1673 # We check GetIssue because we only add hashtags from the
1674 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001675 # TODO(b/265929888): When we fully launch the new path:
1676 # 1) remove fetching hashtags from description alltogether
1677 # 2) Or use descrtiption hashtags for:
1678 # `not (self.GetIssue() and multi_change_upload)`
1679 # 3) Or enabled change description tags for multi and single changes
1680 # by adding them post `git push`.
1681 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001682 hashtags.update(change_desc.get_hash_tags())
1683 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001684
1685 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001686 # branch/change.
1687 return refspec_opts
1688
Joanna Wang6215dd02023-02-07 15:58:03 +00001689 def PrepareSquashedCommit(self, options, parent, end_commit=None):
1690 # type: (optparse.Values, str, Optional[str]) -> _NewUpload()
Joanna Wangb88a4342023-01-24 01:28:22 +00001691 """Create a squashed commit to upload."""
Joanna Wangb88a4342023-01-24 01:28:22 +00001692
1693 if end_commit is None:
1694 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1695
1696 reviewers, ccs, change_desc = self._PrepareChange(options, parent,
1697 end_commit)
1698 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1699 with gclient_utils.temporary_file() as desc_tempfile:
1700 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1701 commit_to_push = RunGit(
1702 ['commit-tree', latest_tree, '-p', parent, '-F',
1703 desc_tempfile]).strip()
1704
Joanna Wang7603f042023-03-01 22:17:36 +00001705 # Gerrit may or may not update fast enough to return the correct patchset
1706 # number after we push. Get the pre-upload patchset and increment later.
1707 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001708 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001709 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001710
Joanna Wang6215dd02023-02-07 15:58:03 +00001711 def PrepareCherryPickSquashedCommit(self, options, parent):
1712 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001713 """Create a commit cherry-picked on parent to push."""
1714
Joanna Wang6215dd02023-02-07 15:58:03 +00001715 # The `parent` is what we will cherry-pick on top of.
1716 # The `cherry_pick_base` is the beginning range of what
1717 # we are cherry-picking.
1718 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1719 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001720 self.branchref)
1721
1722 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1723 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1724 with gclient_utils.temporary_file() as desc_tempfile:
1725 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001726 commit_to_cp = RunGit([
1727 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1728 desc_tempfile
1729 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001730
Joanna Wang6215dd02023-02-07 15:58:03 +00001731 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001732 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1733 if ret:
1734 RunGit(['cherry-pick', '--abort'])
1735 RunGit(['checkout', '-q', self.branch])
1736 DieWithError('Could not cleanly cherry-pick')
1737
Joanna Wang6215dd02023-02-07 15:58:03 +00001738 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001739 RunGit(['checkout', '-q', self.branch])
1740
Joanna Wang7603f042023-03-01 22:17:36 +00001741 # Gerrit may or may not update fast enough to return the correct patchset
1742 # number after we push. Get the pre-upload patchset and increment later.
1743 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001744 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001745 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001746
Joanna Wangb46232e2023-01-21 01:58:46 +00001747 def _PrepareChange(self, options, parent, end_commit):
1748 # type: (optparse.Values, str, str) ->
1749 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1750 """Prepares the change to be uploaded."""
1751 self.EnsureCanUploadPatchset(options.force)
1752
1753 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1754 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1755 files)
1756
1757 watchlist = watchlists.Watchlists(settings.GetRoot())
1758 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1759 if not options.bypass_hooks:
1760 hook_results = self.RunHook(committing=False,
1761 may_prompt=not options.force,
1762 verbose=options.verbose,
1763 parallel=options.parallel,
1764 upstream=parent,
1765 description=change_desc.description,
1766 all_files=False)
1767 self.ExtendCC(hook_results['more_cc'])
1768
1769 # Update the change description and ensure we have a Change Id.
1770 if self.GetIssue():
1771 if options.edit_description:
1772 change_desc.prompt()
1773 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1774 change_id = change_detail['change_id']
1775 change_desc.ensure_change_id(change_id)
1776
Joanna Wangb46232e2023-01-21 01:58:46 +00001777 else: # No change issue. First time uploading
1778 if not options.force and not options.message_file:
1779 change_desc.prompt()
1780
1781 # Check if user added a change_id in the descripiton.
1782 change_ids = git_footers.get_footer_change_id(change_desc.description)
1783 if len(change_ids) == 1:
1784 change_id = change_ids[0]
1785 else:
1786 change_id = GenerateGerritChangeId(change_desc.description)
1787 change_desc.ensure_change_id(change_id)
1788
1789 if options.preserve_tryjobs:
1790 change_desc.set_preserve_tryjobs()
1791
1792 SaveDescriptionBackup(change_desc)
1793
1794 # Add ccs
1795 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001796 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001797 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001798 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001799 ccs = self.GetCCList().split(',')
1800 if len(ccs) > 100:
1801 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1802 'process/lsc/lsc_workflow.md')
1803 print('WARNING: This will auto-CC %s users.' % len(ccs))
1804 print('LSC may be more appropriate: %s' % lsc)
1805 print('You can also use the --no-autocc flag to disable auto-CC.')
1806 confirm_or_exit(action='continue')
1807
1808 # Add ccs from the --cc flag.
1809 if options.cc:
1810 ccs.extend(options.cc)
1811
1812 ccs = [email.strip() for email in ccs if email.strip()]
1813 if change_desc.get_cced():
1814 ccs.extend(change_desc.get_cced())
1815
1816 return change_desc.get_reviewers(), ccs, change_desc
1817
Joanna Wang40497912023-01-24 21:18:16 +00001818 def PostUploadUpdates(self, options, new_upload, change_number):
1819 # type: (optparse.Values, _NewUpload, change_number) -> None
1820 """Makes necessary post upload changes to the local and remote cl."""
1821 if not self.GetIssue():
1822 self.SetIssue(change_number)
1823
Joanna Wang7603f042023-03-01 22:17:36 +00001824 self.SetPatchset(new_upload.prev_patchset + 1)
1825
Joanna Wang40497912023-01-24 21:18:16 +00001826 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1827 new_upload.commit_to_push)
1828 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1829 new_upload.new_last_uploaded_commit)
1830
1831 if settings.GetRunPostUploadHook():
1832 self.RunPostUploadHook(options.verbose, new_upload.parent,
1833 new_upload.change_desc.description,
1834 options.no_python2_post_upload_hooks)
1835
1836 if new_upload.reviewers or new_upload.ccs:
1837 gerrit_util.AddReviewers(self.GetGerritHost(),
1838 self._GerritChangeIdentifier(),
1839 reviewers=new_upload.reviewers,
1840 ccs=new_upload.ccs,
1841 notify=bool(options.send_mail))
1842
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001843 def CMDUpload(self, options, git_diff_args, orig_args):
1844 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001845 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001846 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001847 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001848 else:
1849 if self.GetBranch() is None:
1850 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1851
1852 # Default to diffing against common ancestor of upstream branch
1853 base_branch = self.GetCommonAncestorWithUpstream()
1854 git_diff_args = [base_branch, 'HEAD']
1855
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001856 # Fast best-effort checks to abort before running potentially expensive
1857 # hooks if uploading is likely to fail anyway. Passing these checks does
1858 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001859 self.EnsureAuthenticated(force=options.force)
1860 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001861
1862 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001863 watchlist = watchlists.Watchlists(settings.GetRoot())
1864 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001865 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001866 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001867
Edward Lemur5a644f82020-03-18 16:44:57 +00001868 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001869 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001870 hook_results = self.RunHook(committing=False,
1871 may_prompt=not options.force,
1872 verbose=options.verbose,
1873 parallel=options.parallel,
1874 upstream=base_branch,
1875 description=change_desc.description,
1876 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001877 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001878
Aaron Gable13101a62018-02-09 13:20:41 -08001879 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001880 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001881 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001882 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001883 if self.GetBranch() is not None:
1884 self._GitSetBranchConfigValue(
1885 LAST_UPLOAD_HASH_CONFIG_KEY,
1886 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001887 # Run post upload hooks, if specified.
1888 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001889 self.RunPostUploadHook(options.verbose, base_branch,
1890 change_desc.description,
1891 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001892
1893 # Upload all dependencies if specified.
1894 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001895 print()
1896 print('--dependencies has been specified.')
1897 print('All dependent local branches will be re-uploaded.')
1898 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001899 # Remove the dependencies flag from args so that we do not end up in a
1900 # loop.
1901 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001902 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001903 return ret
1904
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001905 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001906 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001907
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001908 Issue must have been already uploaded and known. Optionally allows for
1909 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001910 """
1911 assert new_state in _CQState.ALL_STATES
1912 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001913 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001914 vote_map = {
1915 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001916 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001917 _CQState.DRY_RUN: 1,
1918 _CQState.COMMIT: 2,
1919 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001920 if new_state == _CQState.QUICK_RUN:
1921 labels = {
1922 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1923 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1924 }
1925 else:
1926 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001927 notify = False if new_state == _CQState.DRY_RUN else None
1928 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001929 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001930 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001931 return 0
1932 except KeyboardInterrupt:
1933 raise
1934 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001935 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001936 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001937 ' * Your project has no CQ,\n'
1938 ' * You don\'t have permission to change the CQ state,\n'
1939 ' * There\'s a bug in this code (see stack trace below).\n'
1940 'Consider specifying which bots to trigger manually or asking your '
1941 'project owners for permissions or contacting Chrome Infra at:\n'
1942 'https://www.chromium.org/infra\n\n' %
1943 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001944 # Still raise exception so that stack trace is printed.
1945 raise
1946
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001947 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948 # Lazy load of configs.
1949 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001950 if self._gerrit_host and '.' not in self._gerrit_host:
1951 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1952 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001953 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001954 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001955 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001956 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001957 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1958 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959 return self._gerrit_host
1960
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001961 def _GetGitHost(self):
1962 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001963 remote_url = self.GetRemoteUrl()
1964 if not remote_url:
1965 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001966 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001967
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 def GetCodereviewServer(self):
1969 if not self._gerrit_server:
1970 # If we're on a branch then get the server potentially associated
1971 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001972 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001973 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001974 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001975 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001976 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001977 if not self._gerrit_server:
1978 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1979 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001980 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001981 parts[0] = parts[0] + '-review'
1982 self._gerrit_host = '.'.join(parts)
1983 self._gerrit_server = 'https://%s' % self._gerrit_host
1984 return self._gerrit_server
1985
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001986 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001987 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001988 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001989 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001990 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001991 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001992 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001993 if project.endswith('.git'):
1994 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001995 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1996 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1997 # gitiles/git-over-https protocol. E.g.,
1998 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1999 # as
2000 # https://chromium.googlesource.com/v8/v8
2001 if project.startswith('a/'):
2002 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002003 return project
2004
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002005 def _GerritChangeIdentifier(self):
2006 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2007
2008 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002009 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002010 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002011 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002012 if project:
2013 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2014 # Fall back on still unique, but less efficient change number.
2015 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002016
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002017 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002018 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002019 if settings.GetGerritSkipEnsureAuthenticated():
2020 # For projects with unusual authentication schemes.
2021 # See http://crbug.com/603378.
2022 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002023
2024 # Check presence of cookies only if using cookies-based auth method.
2025 cookie_auth = gerrit_util.Authenticator.get()
2026 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002027 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002028
Florian Mayerae510e82020-01-30 21:04:48 +00002029 remote_url = self.GetRemoteUrl()
2030 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002031 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002032 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002033 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2034 logging.warning(
2035 'Ignoring branch %(branch)s with non-https/sso remote '
2036 '%(remote)s', {
2037 'branch': self.branch,
2038 'remote': self.GetRemoteUrl()
2039 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002040 return
2041
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002042 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002043 self.GetCodereviewServer()
2044 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002045 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002046
2047 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2048 git_auth = cookie_auth.get_auth_header(git_host)
2049 if gerrit_auth and git_auth:
2050 if gerrit_auth == git_auth:
2051 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002052 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002053 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002054 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002055 ' %s\n'
2056 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002057 ' Consider running the following command:\n'
2058 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002059 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002060 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002061 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002062 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002063 cookie_auth.get_new_password_message(git_host)))
2064 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002065 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002066 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002067
2068 missing = (
2069 ([] if gerrit_auth else [self._gerrit_host]) +
2070 ([] if git_auth else [git_host]))
2071 DieWithError('Credentials for the following hosts are required:\n'
2072 ' %s\n'
2073 'These are read from %s (or legacy %s)\n'
2074 '%s' % (
2075 '\n '.join(missing),
2076 cookie_auth.get_gitcookies_path(),
2077 cookie_auth.get_netrc_path(),
2078 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002079
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002080 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002081 if not self.GetIssue():
2082 return
2083
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002084 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002085 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002086 DieWithError(
2087 'Change %s has been abandoned, new uploads are not allowed' %
2088 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002089 if status == 'MERGED':
2090 answer = gclient_utils.AskForData(
2091 'Change %s has been submitted, new uploads are not allowed. '
2092 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2093 ).lower()
2094 if answer not in ('y', ''):
2095 DieWithError('New uploads are not allowed.')
2096 self.SetIssue()
2097 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002098
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002099 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2100 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2101 # Apparently this check is not very important? Otherwise get_auth_email
2102 # could have been added to other implementations of Authenticator.
2103 cookies_auth = gerrit_util.Authenticator.get()
2104 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002105 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002106
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002107 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002108 if self.GetIssueOwner() == cookies_user:
2109 return
2110 logging.debug('change %s owner is %s, cookies user is %s',
2111 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002112 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002113 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002114 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002115 if details['email'] == self.GetIssueOwner():
2116 return
2117 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002118 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002119 'as %s.\n'
2120 'Uploading may fail due to lack of permissions.' %
2121 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2122 confirm_or_exit(action='upload')
2123
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002124 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002125 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002126 or CQ status, assuming adherence to a common workflow.
2127
2128 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002129 * 'error' - error from review tool (including deleted issues)
2130 * 'unsent' - no reviewers added
2131 * 'waiting' - waiting for review
2132 * 'reply' - waiting for uploader to reply to review
2133 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002134 * 'dry-run' - dry-running in the CQ
2135 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002136 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002137 """
2138 if not self.GetIssue():
2139 return None
2140
2141 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002142 data = self._GetChangeDetail([
2143 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002144 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002145 return 'error'
2146
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002147 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002148 return 'closed'
2149
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002150 cq_label = data['labels'].get('Commit-Queue', {})
2151 max_cq_vote = 0
2152 for vote in cq_label.get('all', []):
2153 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2154 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002155 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002156 if max_cq_vote == 1:
2157 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002158
Aaron Gable9ab38c62017-04-06 14:36:33 -07002159 if data['labels'].get('Code-Review', {}).get('approved'):
2160 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002161
2162 if not data.get('reviewers', {}).get('REVIEWER', []):
2163 return 'unsent'
2164
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002165 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002166 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002167 while messages:
2168 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002169 if (m.get('tag', '').startswith('autogenerated:cq') or
2170 m.get('tag', '').startswith('autogenerated:cv')):
2171 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002172 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002173 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002174 # Most recent message was by owner.
2175 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002176
2177 # Some reply from non-owner.
2178 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002179
2180 # Somehow there are no messages even though there are reviewers.
2181 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002182
Gavin Mak4e5e3992022-11-14 22:40:12 +00002183 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002184 if not self.GetIssue():
2185 return None
2186
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002187 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002188 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002189 if update:
2190 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002191 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002192
Gavin Makf35a9eb2022-11-17 18:34:36 +00002193 def _IsPatchsetRangeSignificant(self, lower, upper):
2194 """Returns True if the inclusive range of patchsets contains any reworks or
2195 rebases."""
2196 if not self.GetIssue():
2197 return False
2198
2199 data = self._GetChangeDetail(['ALL_REVISIONS'])
2200 ps_kind = {}
2201 for rev_info in data.get('revisions', {}).values():
2202 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2203
2204 for ps in range(lower, upper + 1):
2205 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2206 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2207 return True
2208 return False
2209
Gavin Make61ccc52020-11-13 00:12:57 +00002210 def GetMostRecentDryRunPatchset(self):
2211 """Get patchsets equivalent to the most recent patchset and return
2212 the patchset with the latest dry run. If none have been dry run, return
2213 the latest patchset."""
2214 if not self.GetIssue():
2215 return None
2216
2217 data = self._GetChangeDetail(['ALL_REVISIONS'])
2218 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002219 dry_run = {int(m['_revision_number'])
2220 for m in data.get('messages', [])
2221 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002222
2223 for revision_info in sorted(data.get('revisions', {}).values(),
2224 key=lambda c: c['_number'], reverse=True):
2225 if revision_info['_number'] in dry_run:
2226 patchset = revision_info['_number']
2227 break
2228 if revision_info.get('kind', '') not in \
2229 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2230 break
2231 self.SetPatchset(patchset)
2232 return patchset
2233
Aaron Gable636b13f2017-07-14 10:42:48 -07002234 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002235 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002236 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002237 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002238
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002239 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002240 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002241 # CURRENT_REVISION is included to get the latest patchset so that
2242 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002243 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002244 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2245 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002246 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002247 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002248 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002249 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002250
2251 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002252 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002253 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002254 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002255 line_comments = file_comments.setdefault(path, [])
2256 line_comments.extend(
2257 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002258
2259 # Build dictionary of file comments for easy access and sorting later.
2260 # {author+date: {path: {patchset: {line: url+message}}}}
2261 comments = collections.defaultdict(
2262 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002263
2264 server = self.GetCodereviewServer()
2265 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2266 # /c/ is automatically added by short URL server.
2267 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2268 self.GetIssue())
2269 else:
2270 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2271
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002272 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002273 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002274 tag = comment.get('tag', '')
2275 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002276 continue
2277 key = (comment['author']['email'], comment['updated'])
2278 if comment.get('side', 'REVISION') == 'PARENT':
2279 patchset = 'Base'
2280 else:
2281 patchset = 'PS%d' % comment['patch_set']
2282 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002283 url = ('%s/%s/%s#%s%s' %
2284 (url_prefix, comment['patch_set'], path,
2285 'b' if comment.get('side') == 'PARENT' else '',
2286 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002287 comments[key][path][patchset][line] = (url, comment['message'])
2288
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002289 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002290 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002291 summary = self._BuildCommentSummary(msg, comments, readable)
2292 if summary:
2293 summaries.append(summary)
2294 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002295
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002296 @staticmethod
2297 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002298 if 'email' not in msg['author']:
2299 # Some bot accounts may not have an email associated.
2300 return None
2301
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002302 key = (msg['author']['email'], msg['date'])
2303 # Don't bother showing autogenerated messages that don't have associated
2304 # file or line comments. this will filter out most autogenerated
2305 # messages, but will keep robot comments like those from Tricium.
2306 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2307 if is_autogenerated and not comments.get(key):
2308 return None
2309 message = msg['message']
2310 # Gerrit spits out nanoseconds.
2311 assert len(msg['date'].split('.')[-1]) == 9
2312 date = datetime.datetime.strptime(msg['date'][:-3],
2313 '%Y-%m-%d %H:%M:%S.%f')
2314 if key in comments:
2315 message += '\n'
2316 for path, patchsets in sorted(comments.get(key, {}).items()):
2317 if readable:
2318 message += '\n%s' % path
2319 for patchset, lines in sorted(patchsets.items()):
2320 for line, (url, content) in sorted(lines.items()):
2321 if line:
2322 line_str = 'Line %d' % line
2323 path_str = '%s:%d:' % (path, line)
2324 else:
2325 line_str = 'File comment'
2326 path_str = '%s:0:' % path
2327 if readable:
2328 message += '\n %s, %s: %s' % (patchset, line_str, url)
2329 message += '\n %s\n' % content
2330 else:
2331 message += '\n%s ' % path_str
2332 message += '\n%s\n' % content
2333
2334 return _CommentSummary(
2335 date=date,
2336 message=message,
2337 sender=msg['author']['email'],
2338 autogenerated=is_autogenerated,
2339 # These could be inferred from the text messages and correlated with
2340 # Code-Review label maximum, however this is not reliable.
2341 # Leaving as is until the need arises.
2342 approval=False,
2343 disapproval=False,
2344 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002345
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002347 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002348 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002350 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002351 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002352 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002353
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002354 def _GetChangeDetail(self, options=None):
2355 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002356 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002357 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002358
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002359 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002360 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002361 options.append('CURRENT_COMMIT')
2362
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002363 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002364 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002365 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002366
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002367 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2368 # Assumption: data fetched before with extra options is suitable
2369 # for return for a smaller set of options.
2370 # For example, if we cached data for
2371 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2372 # and request is for options=[CURRENT_REVISION],
2373 # THEN we can return prior cached data.
2374 if options_set.issubset(cached_options_set):
2375 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002376
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002377 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002378 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002379 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002380 except gerrit_util.GerritError as e:
2381 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002382 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002383 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002384
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002385 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002386 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002387
Gavin Mak4e5e3992022-11-14 22:40:12 +00002388 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002389 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002390 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002391 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2392 self._GerritChangeIdentifier(),
2393 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002394 except gerrit_util.GerritError as e:
2395 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002396 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002397 raise
agable32978d92016-11-01 12:55:02 -07002398 return data
2399
Karen Qian40c19422019-03-13 21:28:29 +00002400 def _IsCqConfigured(self):
2401 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002402 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002403
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002404 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002405 if git_common.is_dirty_git_tree('land'):
2406 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002407
tandriid60367b2016-06-22 05:25:12 -07002408 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002409 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002410 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002411 'which can test and land changes for you. '
2412 'Are you sure you wish to bypass it?\n',
2413 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002414 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002415 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002416 # Note: git diff outputs nothing if there is no diff.
2417 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002418 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002419 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002420 if detail['current_revision'] == last_upload:
2421 differs = False
2422 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002423 print('WARNING: Local branch contents differ from latest uploaded '
2424 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002425 if differs:
2426 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002427 confirm_or_exit(
2428 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2429 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002430 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002431 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002432 upstream = self.GetCommonAncestorWithUpstream()
2433 if self.GetIssue():
2434 description = self.FetchDescription()
2435 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002436 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002437 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002438 committing=True,
2439 may_prompt=not force,
2440 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002441 parallel=parallel,
2442 upstream=upstream,
2443 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002444 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002445 resultdb=resultdb,
2446 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002447
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002448 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002449 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002450 links = self._GetChangeCommit().get('web_links', [])
2451 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002452 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002453 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002454 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002455 return 0
2456
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002457 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2458 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002459 assert parsed_issue_arg.valid
2460
Edward Lemur125d60a2019-09-13 18:25:41 +00002461 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002462
2463 if parsed_issue_arg.hostname:
2464 self._gerrit_host = parsed_issue_arg.hostname
2465 self._gerrit_server = 'https://%s' % self._gerrit_host
2466
tandriic2405f52016-10-10 08:13:15 -07002467 try:
2468 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002469 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002470 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002471
2472 if not parsed_issue_arg.patchset:
2473 # Use current revision by default.
2474 revision_info = detail['revisions'][detail['current_revision']]
2475 patchset = int(revision_info['_number'])
2476 else:
2477 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002478 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002479 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2480 break
2481 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002482 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002483 (parsed_issue_arg.patchset, self.GetIssue()))
2484
Edward Lemur125d60a2019-09-13 18:25:41 +00002485 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002486 if remote_url.endswith('.git'):
2487 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002488 remote_url = remote_url.rstrip('/')
2489
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002490 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002491 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002492
2493 if remote_url != fetch_info['url']:
2494 DieWithError('Trying to patch a change from %s but this repo appears '
2495 'to be %s.' % (fetch_info['url'], remote_url))
2496
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002497 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002498
Joanna Wangc023a632023-01-26 17:59:25 +00002499 # Set issue immediately in case the cherry-pick fails, which happens
2500 # when resolving conflicts.
2501 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002502 self.SetIssue(parsed_issue_arg.issue)
2503
Aaron Gable62619a32017-06-16 08:22:09 -07002504 if force:
2505 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2506 print('Checked out commit for change %i patchset %i locally' %
2507 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002508 elif nocommit:
2509 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2510 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002511 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002512 RunGit(['cherry-pick', 'FETCH_HEAD'])
2513 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002514 (parsed_issue_arg.issue, patchset))
2515 print('Note: this created a local commit which does not have '
2516 'the same hash as the one uploaded for review. This will make '
2517 'uploading changes based on top of this branch difficult.\n'
2518 'If you want to do that, use "git cl patch --force" instead.')
2519
Stefan Zagerd08043c2017-10-12 12:07:02 -07002520 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002521 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002522 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002523 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2524 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002525 else:
2526 print('WARNING: You are in detached HEAD state.\n'
2527 'The patch has been applied to your checkout, but you will not be '
2528 'able to upload a new patch set to the gerrit issue.\n'
2529 'Try using the \'-b\' option if you would like to work on a '
2530 'branch and/or upload a new patch set.')
2531
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002532 return 0
2533
Joanna Wang18de1f62023-01-21 01:24:24 +00002534 @staticmethod
2535 def _GerritCommitMsgHookCheck(offer_removal):
2536 # type: (bool) -> None
2537 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002538 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2539 if not os.path.exists(hook):
2540 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002541 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2542 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002543 data = gclient_utils.FileRead(hook)
2544 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2545 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002546 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002547 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002548 'and may interfere with it in subtle ways.\n'
2549 'We recommend you remove the commit-msg hook.')
2550 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002551 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002552 gclient_utils.rm_file_or_tree(hook)
2553 print('Gerrit commit-msg hook removed.')
2554 else:
2555 print('OK, will keep Gerrit commit-msg hook in place.')
2556
Edward Lemur1b52d872019-05-09 21:12:12 +00002557 def _CleanUpOldTraces(self):
2558 """Keep only the last |MAX_TRACES| traces."""
2559 try:
2560 traces = sorted([
2561 os.path.join(TRACES_DIR, f)
2562 for f in os.listdir(TRACES_DIR)
2563 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2564 and not f.startswith('tmp'))
2565 ])
2566 traces_to_delete = traces[:-MAX_TRACES]
2567 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002568 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002569 except OSError:
2570 print('WARNING: Failed to remove old git traces from\n'
2571 ' %s'
2572 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002573
Edward Lemur5737f022019-05-17 01:24:00 +00002574 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002575 """Zip and write the git push traces stored in traces_dir."""
2576 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002577 traces_zip = trace_name + '-traces'
2578 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002579 # Create a temporary dir to store git config and gitcookies in. It will be
2580 # compressed and stored next to the traces.
2581 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002582 git_info_zip = trace_name + '-git-info'
2583
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002584 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002585
Edward Lemur1b52d872019-05-09 21:12:12 +00002586 git_push_metadata['trace_name'] = trace_name
2587 gclient_utils.FileWrite(
2588 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2589
2590 # Keep only the first 6 characters of the git hashes on the packet
2591 # trace. This greatly decreases size after compression.
2592 packet_traces = os.path.join(traces_dir, 'trace-packet')
2593 if os.path.isfile(packet_traces):
2594 contents = gclient_utils.FileRead(packet_traces)
2595 gclient_utils.FileWrite(
2596 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2597 shutil.make_archive(traces_zip, 'zip', traces_dir)
2598
2599 # Collect and compress the git config and gitcookies.
2600 git_config = RunGit(['config', '-l'])
2601 gclient_utils.FileWrite(
2602 os.path.join(git_info_dir, 'git-config'),
2603 git_config)
2604
2605 cookie_auth = gerrit_util.Authenticator.get()
2606 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2607 gitcookies_path = cookie_auth.get_gitcookies_path()
2608 if os.path.isfile(gitcookies_path):
2609 gitcookies = gclient_utils.FileRead(gitcookies_path)
2610 gclient_utils.FileWrite(
2611 os.path.join(git_info_dir, 'gitcookies'),
2612 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2613 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2614
Edward Lemur1b52d872019-05-09 21:12:12 +00002615 gclient_utils.rmtree(git_info_dir)
2616
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002617 def _RunGitPushWithTraces(self,
2618 refspec,
2619 refspec_opts,
2620 git_push_metadata,
2621 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002622 """Run git push and collect the traces resulting from the execution."""
2623 # Create a temporary directory to store traces in. Traces will be compressed
2624 # and stored in a 'traces' dir inside depot_tools.
2625 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002626 trace_name = os.path.join(
2627 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002628
2629 env = os.environ.copy()
2630 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2631 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002632 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002633 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2634 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2635 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2636
2637 try:
2638 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002639 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002640 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002641 push_cmd = ['git', 'push', remote_url, refspec]
2642 if git_push_options:
2643 for opt in git_push_options:
2644 push_cmd.extend(['-o', opt])
2645
Edward Lemur0f58ae42019-04-30 17:24:12 +00002646 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002647 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002648 env=env,
2649 print_stdout=True,
2650 # Flush after every line: useful for seeing progress when running as
2651 # recipe.
2652 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002653 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002654 except subprocess2.CalledProcessError as e:
2655 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002656 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002657 raise GitPushError(
2658 'Failed to create a change, very likely due to blocked keyword. '
2659 'Please examine output above for the reason of the failure.\n'
2660 'If this is a false positive, you can try to bypass blocked '
2661 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002662 '-o banned-words~skip, e.g.:\n'
2663 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002664 'If git-cl is not working correctly, file a bug under the '
2665 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002666 if 'git push -o nokeycheck' in str(e.stdout):
2667 raise GitPushError(
2668 'Failed to create a change, very likely due to a private key being '
2669 'detected. Please examine output above for the reason of the '
2670 'failure.\n'
2671 'If this is a false positive, you can try to bypass private key '
2672 'detection by using push option '
2673 '-o nokeycheck, e.g.:\n'
2674 'git cl upload -o nokeycheck\n\n'
2675 'If git-cl is not working correctly, file a bug under the '
2676 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002677
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002678 raise GitPushError(
2679 'Failed to create a change. Please examine output above for the '
2680 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002681 'For emergencies, Googlers can escalate to '
2682 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002683 'Hint: run command below to diagnose common Git/Gerrit '
2684 'credential problems:\n'
2685 ' git cl creds-check\n'
2686 '\n'
2687 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2688 'component including the files below.\n'
2689 'Review the files before upload, since they might contain sensitive '
2690 'information.\n'
2691 'Set the Restrict-View-Google label so that they are not publicly '
2692 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002693 finally:
2694 execution_time = time_time() - before_push
2695 metrics.collector.add_repeated('sub_commands', {
2696 'command': 'git push',
2697 'execution_time': execution_time,
2698 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002699 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002700 })
2701
Edward Lemur1b52d872019-05-09 21:12:12 +00002702 git_push_metadata['execution_time'] = execution_time
2703 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002704 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002705
Edward Lemur1b52d872019-05-09 21:12:12 +00002706 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002707 gclient_utils.rmtree(traces_dir)
2708
2709 return push_stdout
2710
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002711 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2712 change_desc):
2713 """Upload the current branch to Gerrit, retry if new remote HEAD is
2714 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002715 remote, remote_branch = self.GetRemoteBranch()
2716 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2717
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002718 try:
2719 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002720 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002721 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002722 # Repository might be in the middle of transition to main branch as
2723 # default, and uploads to old default might be blocked.
2724 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002725 DieWithError(str(e), change_desc)
2726
Josip Sokcevicb631a882021-01-06 18:18:10 +00002727 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2728 self.GetGerritProject())
2729 if project_head == branch:
2730 DieWithError(str(e), change_desc)
2731 branch = project_head
2732
2733 print("WARNING: Fetching remote state and retrying upload to default "
2734 "branch...")
2735 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002736 options.edit_description = False
2737 options.force = True
2738 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002739 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2740 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002741 except GitPushError as e:
2742 DieWithError(str(e), change_desc)
2743
2744 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002745 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002747 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002748 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002749 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002750 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002751 # User requested to change description
2752 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002753 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002754 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2755 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002756 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002757
2758 # Check if changes outside of this workspace have been uploaded.
2759 current_rev = change_detail['current_revision']
2760 last_uploaded_rev = self._GitGetBranchConfigValue(
2761 GERRIT_SQUASH_HASH_CONFIG_KEY)
2762 if last_uploaded_rev and current_rev != last_uploaded_rev:
2763 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002764 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002765 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002766 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002767 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002768 if len(change_ids) == 1:
2769 change_id = change_ids[0]
2770 else:
2771 change_id = GenerateGerritChangeId(change_desc.description)
2772 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002773
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002774 if options.preserve_tryjobs:
2775 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002776
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002777 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002778 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002779 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002780 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002781 with gclient_utils.temporary_file() as desc_tempfile:
2782 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2783 ref_to_push = RunGit(
2784 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002785 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002786 if options.no_add_changeid:
2787 pass
2788 else: # adding Change-Ids is okay.
2789 if not git_footers.get_footer_change_id(change_desc.description):
2790 DownloadGerritHook(False)
2791 change_desc.set_description(
2792 self._AddChangeIdToCommitMessage(change_desc.description,
2793 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002794 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002795 # For no-squash mode, we assume the remote called "origin" is the one we
2796 # want. It is not worthwhile to support different workflows for
2797 # no-squash mode.
2798 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002799 # attempt to extract the changeid from the current description
2800 # fail informatively if not possible.
2801 change_id_candidates = git_footers.get_footer_change_id(
2802 change_desc.description)
2803 if not change_id_candidates:
2804 DieWithError("Unable to extract change-id from message.")
2805 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002806
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002807 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002808 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2809 ref_to_push)]).splitlines()
2810 if len(commits) > 1:
2811 print('WARNING: This will upload %d commits. Run the following command '
2812 'to see which commits will be uploaded: ' % len(commits))
2813 print('git log %s..%s' % (parent, ref_to_push))
2814 print('You can also use `git squash-branch` to squash these into a '
2815 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002816 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002818 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002819 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002820 # Add default, watchlist, presubmit ccs if this is the initial upload
2821 # and CL is not private and auto-ccing has not been disabled.
2822 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002823 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002824 if len(cc) > 100:
2825 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2826 'process/lsc/lsc_workflow.md')
2827 print('WARNING: This will auto-CC %s users.' % len(cc))
2828 print('LSC may be more appropriate: %s' % lsc)
2829 print('You can also use the --no-autocc flag to disable auto-CC.')
2830 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002831 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002832 if options.cc:
2833 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002834 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002835 if change_desc.get_cced():
2836 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002837 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002838 valid_accounts = set(reviewers + cc)
2839 # TODO(crbug/877717): relax this for all hosts.
2840 else:
2841 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002842 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002843 logging.info('accounts %s are recognized, %s invalid',
2844 sorted(valid_accounts),
2845 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002846
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002847 # Extra options that can be specified at push time. Doc:
2848 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002849 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002850
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002851 for r in sorted(reviewers):
2852 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002853 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002854 reviewers.remove(r)
2855 else:
2856 # TODO(tandrii): this should probably be a hard failure.
2857 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2858 % r)
2859 for c in sorted(cc):
2860 # refspec option will be rejected if cc doesn't correspond to an
2861 # account, even though REST call to add such arbitrary cc may succeed.
2862 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002863 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002864 cc.remove(c)
2865
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002866 refspec_suffix = ''
2867 if refspec_opts:
2868 refspec_suffix = '%' + ','.join(refspec_opts)
2869 assert ' ' not in refspec_suffix, (
2870 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2871 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002872
Edward Lemur1b52d872019-05-09 21:12:12 +00002873 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002874 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002875 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002876 'change_id': change_id,
2877 'description': change_desc.description,
2878 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002879
Gavin Mak4e5e3992022-11-14 22:40:12 +00002880 # Gerrit may or may not update fast enough to return the correct patchset
2881 # number after we push. Get the pre-upload patchset and increment later.
2882 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2883
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002884 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002885 git_push_metadata,
2886 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002887
2888 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002889 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890 change_numbers = [m.group(1)
2891 for m in map(regex.match, push_stdout.splitlines())
2892 if m]
2893 if len(change_numbers) != 1:
2894 DieWithError(
2895 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002896 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002897 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002898 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002899 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002900
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002901 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002902 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002903 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002904 gerrit_util.AddReviewers(self.GetGerritHost(),
2905 self._GerritChangeIdentifier(),
2906 reviewers,
2907 cc,
2908 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002909
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002910 return 0
2911
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002912 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2913 change_desc):
2914 """Computes parent of the generated commit to be uploaded to Gerrit.
2915
2916 Returns revision or a ref name.
2917 """
2918 if custom_cl_base:
2919 # Try to avoid creating additional unintended CLs when uploading, unless
2920 # user wants to take this risk.
2921 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2922 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2923 local_ref_of_target_remote])
2924 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002925 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002926 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2927 'If you proceed with upload, more than 1 CL may be created by '
2928 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2929 'If you are certain that specified base `%s` has already been '
2930 'uploaded to Gerrit as another CL, you may proceed.\n' %
2931 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2932 if not force:
2933 confirm_or_exit(
2934 'Do you take responsibility for cleaning up potential mess '
2935 'resulting from proceeding with upload?',
2936 action='upload')
2937 return custom_cl_base
2938
Aaron Gablef97e33d2017-03-30 15:44:27 -07002939 if remote != '.':
2940 return self.GetCommonAncestorWithUpstream()
2941
2942 # If our upstream branch is local, we base our squashed commit on its
2943 # squashed version.
2944 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2945
Aaron Gablef97e33d2017-03-30 15:44:27 -07002946 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002947 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002948 if upstream_branch_name == 'main':
2949 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002950
2951 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002952 # TODO(tandrii): consider checking parent change in Gerrit and using its
2953 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2954 # the tree hash of the parent branch. The upside is less likely bogus
2955 # requests to reupload parent change just because it's uploadhash is
2956 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002957 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2958 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002959 # Verify that the upstream branch has been uploaded too, otherwise
2960 # Gerrit will create additional CLs when uploading.
2961 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2962 RunGitSilent(['rev-parse', parent + ':'])):
2963 DieWithError(
2964 '\nUpload upstream branch %s first.\n'
2965 'It is likely that this branch has been rebased since its last '
2966 'upload, so you just need to upload it again.\n'
2967 '(If you uploaded it with --no-squash, then branch dependencies '
2968 'are not supported, and you should reupload with --squash.)'
2969 % upstream_branch_name,
2970 change_desc)
2971 return parent
2972
Gavin Mak4e5e3992022-11-14 22:40:12 +00002973 def _UpdateWithExternalChanges(self):
2974 """Updates workspace with external changes.
2975
2976 Returns the commit hash that should be used as the merge base on upload.
2977 """
2978 local_ps = self.GetPatchset()
2979 if local_ps is None:
2980 return
2981
2982 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002983 if external_ps is None or local_ps == external_ps or \
2984 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002985 return
2986
2987 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002988 if num_changes > 1:
2989 change_words = 'changes were'
2990 else:
2991 change_words = 'change was'
2992 print('\n%d external %s published to %s:\n' %
2993 (num_changes, change_words, self.GetIssueURL(short=True)))
2994
2995 # Print an overview of external changes.
2996 ps_to_commit = {}
2997 ps_to_info = {}
2998 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2999 for commit_id, revision_info in revisions.get('revisions', {}).items():
3000 ps_num = revision_info['_number']
3001 ps_to_commit[ps_num] = commit_id
3002 ps_to_info[ps_num] = revision_info
3003
3004 for ps in range(external_ps, local_ps, -1):
3005 commit = ps_to_commit[ps][:8]
3006 desc = ps_to_info[ps].get('description', '')
3007 print('Patchset %d [%s] %s' % (ps, commit, desc))
3008
3009 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3010 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003011 return
3012
3013 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3014 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3015 external_base = external_parent['commit']
3016
3017 branch = git_common.current_branch()
3018 local_base = self.GetCommonAncestorWithUpstream()
3019 if local_base != external_base:
3020 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3021 (local_base, external_base))
3022 if git_common.upstream(branch):
3023 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3024 'to make these the same.')
3025 print('No upstream branch set. Consider setting it and using '
3026 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3027
3028 # Fetch Gerrit's CL base if it doesn't exist locally.
3029 remote, _ = self.GetRemoteBranch()
3030 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3031 RunGitSilent(['fetch', remote, external_base])
3032
3033 # Get the diff between local_ps and external_ps.
3034 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003035 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003036 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3037 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3038 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3039 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3040 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3041
3042 # Diff can be empty in the case of trivial rebases.
3043 if not diff:
3044 return external_base
3045
3046 # Apply the diff.
3047 with gclient_utils.temporary_file() as diff_tempfile:
3048 gclient_utils.FileWrite(diff_tempfile, diff)
3049 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3050 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3051 if not clean_patch:
3052 # Normally patchset is set after upload. But because we exit, that never
3053 # happens. Updating here makes sure that subsequent uploads don't need
3054 # to fetch/apply the same diff again.
3055 self.SetPatchset(external_ps)
3056 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3057 'conflicts and reupload.')
3058
3059 message = 'Incorporate external changes from '
3060 if num_changes == 1:
3061 message += 'patchset %d' % external_ps
3062 else:
3063 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3064 RunGitSilent(['commit', '-am', message])
3065 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3066 # patchset title instead of this 'Incorporate' message.
3067 return external_base
3068
Edward Lemura12175c2020-03-09 16:58:26 +00003069 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003070 """Re-commits using the current message, assumes the commit hook is in
3071 place.
3072 """
Edward Lemura12175c2020-03-09 16:58:26 +00003073 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003074 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003075 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003076 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003077 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003078
3079 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003080
tandriie113dfd2016-10-11 10:20:12 -07003081 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003082 try:
3083 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003084 except GerritChangeNotExists:
3085 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003086
3087 if data['status'] in ('ABANDONED', 'MERGED'):
3088 return 'CL %s is closed' % self.GetIssue()
3089
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003090 def GetGerritChange(self, patchset=None):
3091 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003092 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003093 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003094 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003095 data = self._GetChangeDetail(['ALL_REVISIONS'])
3096
3097 assert host and issue and patchset, 'CL must be uploaded first'
3098
3099 has_patchset = any(
3100 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003101 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003102 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003103 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003104 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003105
tandrii8c5a3532016-11-04 07:52:02 -07003106 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003107 'host': host,
3108 'change': issue,
3109 'project': data['project'],
3110 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003111 }
tandriie113dfd2016-10-11 10:20:12 -07003112
tandriide281ae2016-10-12 06:02:30 -07003113 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003114 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003115
Edward Lemur707d70b2018-02-07 00:50:14 +01003116 def GetReviewers(self):
3117 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003118 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003119
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003120
Lei Zhang8a0efc12020-08-05 19:58:45 +00003121def _get_bug_line_values(default_project_prefix, bugs):
3122 """Given default_project_prefix and comma separated list of bugs, yields bug
3123 line values.
tandriif9aefb72016-07-01 09:06:51 -07003124
3125 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003126 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003127 * string, which is left as is.
3128
3129 This function may produce more than one line, because bugdroid expects one
3130 project per line.
3131
Lei Zhang8a0efc12020-08-05 19:58:45 +00003132 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003133 ['v8:123', 'chromium:789']
3134 """
3135 default_bugs = []
3136 others = []
3137 for bug in bugs.split(','):
3138 bug = bug.strip()
3139 if bug:
3140 try:
3141 default_bugs.append(int(bug))
3142 except ValueError:
3143 others.append(bug)
3144
3145 if default_bugs:
3146 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003147 if default_project_prefix:
3148 if not default_project_prefix.endswith(':'):
3149 default_project_prefix += ':'
3150 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003151 else:
3152 yield default_bugs
3153 for other in sorted(others):
3154 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3155 yield other
3156
3157
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003158class ChangeDescription(object):
3159 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003160 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003161 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003162 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003163 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003164 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003165 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3166 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003167 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003168 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003169
Dan Beamd8b04ca2019-10-10 21:23:26 +00003170 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003171 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003172 if bug:
3173 regexp = re.compile(self.BUG_LINE)
3174 prefix = settings.GetBugPrefix()
3175 if not any((regexp.match(line) for line in self._description_lines)):
3176 values = list(_get_bug_line_values(prefix, bug))
3177 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003178 if fixed:
3179 regexp = re.compile(self.FIXED_LINE)
3180 prefix = settings.GetBugPrefix()
3181 if not any((regexp.match(line) for line in self._description_lines)):
3182 values = list(_get_bug_line_values(prefix, fixed))
3183 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003184
agable@chromium.org42c20792013-09-12 17:34:49 +00003185 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003186 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003187 return '\n'.join(self._description_lines)
3188
3189 def set_description(self, desc):
3190 if isinstance(desc, basestring):
3191 lines = desc.splitlines()
3192 else:
3193 lines = [line.rstrip() for line in desc]
3194 while lines and not lines[0]:
3195 lines.pop(0)
3196 while lines and not lines[-1]:
3197 lines.pop(-1)
3198 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003199
Edward Lemur5a644f82020-03-18 16:44:57 +00003200 def ensure_change_id(self, change_id):
3201 description = self.description
3202 footer_change_ids = git_footers.get_footer_change_id(description)
3203 # Make sure that the Change-Id in the description matches the given one.
3204 if footer_change_ids != [change_id]:
3205 if footer_change_ids:
3206 # Remove any existing Change-Id footers since they don't match the
3207 # expected change_id footer.
3208 description = git_footers.remove_footer(description, 'Change-Id')
3209 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3210 'if you want to set a new one.')
3211 # Add the expected Change-Id footer.
3212 description = git_footers.add_footer_change_id(description, change_id)
3213 self.set_description(description)
3214
Joanna Wang39811b12023-01-20 23:09:48 +00003215 def update_reviewers(self, reviewers):
3216 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003217
3218 Args:
3219 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003220 """
Joanna Wang39811b12023-01-20 23:09:48 +00003221 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003222 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003223
3224 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003225
Joanna Wang39811b12023-01-20 23:09:48 +00003226 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003227 regexp = re.compile(self.R_LINE)
3228 matches = [regexp.match(line) for line in self._description_lines]
3229 new_desc = [l for i, l in enumerate(self._description_lines)
3230 if not matches[i]]
3231 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232
Joanna Wang39811b12023-01-20 23:09:48 +00003233 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003234
Joanna Wang39811b12023-01-20 23:09:48 +00003235 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003236 for match in matches:
3237 if not match:
3238 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003239 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003240
Joanna Wang39811b12023-01-20 23:09:48 +00003241 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003242
3243 # Put the new lines in the description where the old first R= line was.
3244 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3245 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003246 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003247 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003248 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003249
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003250 def set_preserve_tryjobs(self):
3251 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3252 footers = git_footers.parse_footers(self.description)
3253 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3254 if v.lower() == 'true':
3255 return
3256 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3257
Anthony Polito8b955342019-09-24 19:01:36 +00003258 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003259 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003260 self.set_description([
3261 '# Enter a description of the change.',
3262 '# This will be displayed on the codereview site.',
3263 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003264 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003265 '--------------------',
3266 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003267 bug_regexp = re.compile(self.BUG_LINE)
3268 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003269 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003270 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003271
Dan Beamd8b04ca2019-10-10 21:23:26 +00003272 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003273 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003274
Bruce Dawsonfc487042020-10-27 19:11:37 +00003275 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003276 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003277 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003278 if not content:
3279 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003280 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003281
Bruce Dawson2377b012018-01-11 16:46:49 -08003282 # Strip off comments and default inserted "Bug:" line.
3283 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003284 (line.startswith('#') or
3285 line.rstrip() == "Bug:" or
3286 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003287 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003288 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003289 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003290
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003291 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003292 """Adds a footer line to the description.
3293
3294 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3295 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3296 that Gerrit footers are always at the end.
3297 """
3298 parsed_footer_line = git_footers.parse_footer(line)
3299 if parsed_footer_line:
3300 # Line is a gerrit footer in the form: Footer-Key: any value.
3301 # Thus, must be appended observing Gerrit footer rules.
3302 self.set_description(
3303 git_footers.add_footer(self.description,
3304 key=parsed_footer_line[0],
3305 value=parsed_footer_line[1]))
3306 return
3307
3308 if not self._description_lines:
3309 self._description_lines.append(line)
3310 return
3311
3312 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3313 if gerrit_footers:
3314 # git_footers.split_footers ensures that there is an empty line before
3315 # actual (gerrit) footers, if any. We have to keep it that way.
3316 assert top_lines and top_lines[-1] == ''
3317 top_lines, separator = top_lines[:-1], top_lines[-1:]
3318 else:
3319 separator = [] # No need for separator if there are no gerrit_footers.
3320
3321 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003322 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3323 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003324 top_lines.append('')
3325 top_lines.append(line)
3326 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003327
tandrii99a72f22016-08-17 14:33:24 -07003328 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003329 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003330 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003331 reviewers = [match.group(2).strip()
3332 for match in matches
3333 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003334 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003335
bradnelsond975b302016-10-23 12:20:23 -07003336 def get_cced(self):
3337 """Retrieves the list of reviewers."""
3338 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3339 cced = [match.group(2).strip() for match in matches if match]
3340 return cleanup_list(cced)
3341
Nodir Turakulov23b82142017-11-16 11:04:25 -08003342 def get_hash_tags(self):
3343 """Extracts and sanitizes a list of Gerrit hashtags."""
3344 subject = (self._description_lines or ('',))[0]
3345 subject = re.sub(
3346 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3347
3348 tags = []
3349 start = 0
3350 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3351 while True:
3352 m = bracket_exp.match(subject, start)
3353 if not m:
3354 break
3355 tags.append(self.sanitize_hash_tag(m.group(1)))
3356 start = m.end()
3357
3358 if not tags:
3359 # Try "Tag: " prefix.
3360 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3361 if m:
3362 tags.append(self.sanitize_hash_tag(m.group(1)))
3363 return tags
3364
3365 @classmethod
3366 def sanitize_hash_tag(cls, tag):
3367 """Returns a sanitized Gerrit hash tag.
3368
3369 A sanitized hashtag can be used as a git push refspec parameter value.
3370 """
3371 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3372
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003373
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003374def FindCodereviewSettingsFile(filename='codereview.settings'):
3375 """Finds the given file starting in the cwd and going up.
3376
3377 Only looks up to the top of the repository unless an
3378 'inherit-review-settings-ok' file exists in the root of the repository.
3379 """
3380 inherit_ok_file = 'inherit-review-settings-ok'
3381 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003382 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003383 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003384 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003385 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003386 if os.path.isfile(os.path.join(cwd, filename)):
3387 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003388 if cwd == root:
3389 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003390 parent_dir = os.path.dirname(cwd)
3391 if parent_dir == cwd:
3392 # We hit the system root directory.
3393 break
3394 cwd = parent_dir
3395 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003396
3397
3398def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003399 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003400 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003401
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003402 def SetProperty(name, setting, unset_error_ok=False):
3403 fullname = 'rietveld.' + name
3404 if setting in keyvals:
3405 RunGit(['config', fullname, keyvals[setting]])
3406 else:
3407 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3408
tandrii48df5812016-10-17 03:55:37 -07003409 if not keyvals.get('GERRIT_HOST', False):
3410 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003411 # Only server setting is required. Other settings can be absent.
3412 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003413 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003414 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3415 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003416 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003417 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3418 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003419 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3420 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003421 SetProperty(
3422 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003423 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003424
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003425 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003426 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003427
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003428 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003429 RunGit(['config', 'gerrit.squash-uploads',
3430 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003431
tandrii@chromium.org28253532016-04-14 13:46:56 +00003432 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003433 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003434 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3435
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003436 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003437 # should be of the form
3438 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3439 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003440 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3441 keyvals['ORIGIN_URL_CONFIG']])
3442
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003443
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003444def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003445 """Downloads a network object to a local file, like urllib.urlretrieve.
3446
3447 This is necessary because urllib is broken for SSL connections via a proxy.
3448 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003449 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003450 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003451
3452
ukai@chromium.org712d6102013-11-27 00:52:58 +00003453def hasSheBang(fname):
3454 """Checks fname is a #! script."""
3455 with open(fname) as f:
3456 return f.read(2).startswith('#!')
3457
3458
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003459def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003460 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003461
3462 Args:
3463 force: True to update hooks. False to install hooks if not present.
3464 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003465 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003466 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3467 if not os.access(dst, os.X_OK):
3468 if os.path.exists(dst):
3469 if not force:
3470 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003471 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003472 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003473 if not hasSheBang(dst):
3474 DieWithError('Not a script: %s\n'
3475 'You need to download from\n%s\n'
3476 'into .git/hooks/commit-msg and '
3477 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003478 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3479 except Exception:
3480 if os.path.exists(dst):
3481 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003482 DieWithError('\nFailed to download hooks.\n'
3483 'You need to download from\n%s\n'
3484 'into .git/hooks/commit-msg and '
3485 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003486
3487
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003488class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003489 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003490
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003491 def __init__(self):
3492 # Cached list of [host, identity, source], where source is either
3493 # .gitcookies or .netrc.
3494 self._all_hosts = None
3495
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003496 def ensure_configured_gitcookies(self):
3497 """Runs checks and suggests fixes to make git use .gitcookies from default
3498 path."""
3499 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3500 configured_path = RunGitSilent(
3501 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003502 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003503 if configured_path:
3504 self._ensure_default_gitcookies_path(configured_path, default)
3505 else:
3506 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003507
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003508 @staticmethod
3509 def _ensure_default_gitcookies_path(configured_path, default_path):
3510 assert configured_path
3511 if configured_path == default_path:
3512 print('git is already configured to use your .gitcookies from %s' %
3513 configured_path)
3514 return
3515
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003516 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003517 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3518 (configured_path, default_path))
3519
3520 if not os.path.exists(configured_path):
3521 print('However, your configured .gitcookies file is missing.')
3522 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3523 action='reconfigure')
3524 RunGit(['config', '--global', 'http.cookiefile', default_path])
3525 return
3526
3527 if os.path.exists(default_path):
3528 print('WARNING: default .gitcookies file already exists %s' %
3529 default_path)
3530 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3531 default_path)
3532
3533 confirm_or_exit('Move existing .gitcookies to default location?',
3534 action='move')
3535 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003536 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003537 print('Moved and reconfigured git to use .gitcookies from %s' %
3538 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003539
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003540 @staticmethod
3541 def _configure_gitcookies_path(default_path):
3542 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3543 if os.path.exists(netrc_path):
3544 print('You seem to be using outdated .netrc for git credentials: %s' %
3545 netrc_path)
3546 print('This tool will guide you through setting up recommended '
3547 '.gitcookies store for git credentials.\n'
3548 '\n'
3549 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3550 ' git config --global --unset http.cookiefile\n'
3551 ' mv %s %s.backup\n\n' % (default_path, default_path))
3552 confirm_or_exit(action='setup .gitcookies')
3553 RunGit(['config', '--global', 'http.cookiefile', default_path])
3554 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003555
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003556 def get_hosts_with_creds(self, include_netrc=False):
3557 if self._all_hosts is None:
3558 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003559 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3560 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3561 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3562 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003563
3564 if include_netrc:
3565 return self._all_hosts
3566 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3567
3568 def print_current_creds(self, include_netrc=False):
3569 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3570 if not hosts:
3571 print('No Git/Gerrit credentials found')
3572 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003573 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003574 header = [('Host', 'User', 'Which file'),
3575 ['=' * l for l in lengths]]
3576 for row in (header + hosts):
3577 print('\t'.join((('%%+%ds' % l) % s)
3578 for l, s in zip(lengths, row)))
3579
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003580 @staticmethod
3581 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003582 """Parses identity "git-<username>.domain" into <username> and domain."""
3583 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003584 # distinguishable from sub-domains. But we do know typical domains:
3585 if identity.endswith('.chromium.org'):
3586 domain = 'chromium.org'
3587 username = identity[:-len('.chromium.org')]
3588 else:
3589 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003590 if username.startswith('git-'):
3591 username = username[len('git-'):]
3592 return username, domain
3593
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003594 def has_generic_host(self):
3595 """Returns whether generic .googlesource.com has been configured.
3596
3597 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3598 """
3599 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003600 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003601 return True
3602 return False
3603
3604 def _get_git_gerrit_identity_pairs(self):
3605 """Returns map from canonic host to pair of identities (Git, Gerrit).
3606
3607 One of identities might be None, meaning not configured.
3608 """
3609 host_to_identity_pairs = {}
3610 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003611 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003612 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3613 idx = 0 if canonical == host else 1
3614 pair[idx] = identity
3615 return host_to_identity_pairs
3616
3617 def get_partially_configured_hosts(self):
3618 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003619 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003620 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003621 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003622
3623 def get_conflicting_hosts(self):
3624 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003625 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003626 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003627 if None not in (i1, i2) and i1 != i2)
3628
3629 def get_duplicated_hosts(self):
3630 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003631 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003632
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003633
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003634 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003635 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003636 hosts = sorted(hosts)
3637 assert hosts
3638 if extra_column_func is None:
3639 extras = [''] * len(hosts)
3640 else:
3641 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003642 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3643 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003644 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003645 lines.append(tmpl % he)
3646 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003647
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003648 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003649 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003650 yield ('.googlesource.com wildcard record detected',
3651 ['Chrome Infrastructure team recommends to list full host names '
3652 'explicitly.'],
3653 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003654
3655 dups = self.get_duplicated_hosts()
3656 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003657 yield ('The following hosts were defined twice',
3658 self._format_hosts(dups),
3659 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003660
3661 partial = self.get_partially_configured_hosts()
3662 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003663 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3664 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003665 self._format_hosts(
3666 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3667 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003668
3669 conflicting = self.get_conflicting_hosts()
3670 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003671 yield ('The following Git hosts have differing credentials from their '
3672 'Gerrit counterparts',
3673 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3674 tuple(self._get_git_gerrit_identity_pairs()[host])),
3675 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003676
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003677 def find_and_report_problems(self):
3678 """Returns True if there was at least one problem, else False."""
3679 found = False
3680 bad_hosts = set()
3681 for title, sublines, hosts in self._find_problems():
3682 if not found:
3683 found = True
3684 print('\n\n.gitcookies problem report:\n')
3685 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003686 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003687 if sublines:
3688 print()
3689 print(' %s' % '\n '.join(sublines))
3690 print()
3691
3692 if bad_hosts:
3693 assert found
3694 print(' You can manually remove corresponding lines in your %s file and '
3695 'visit the following URLs with correct account to generate '
3696 'correct credential lines:\n' %
3697 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003698 print(' %s' % '\n '.join(
3699 sorted(
3700 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3701 _canonical_git_googlesource_host(host))
3702 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003703 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003704
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003705
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003706@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003707def CMDcreds_check(parser, args):
3708 """Checks credentials and suggests changes."""
3709 _, _ = parser.parse_args(args)
3710
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003711 # Code below checks .gitcookies. Abort if using something else.
3712 authn = gerrit_util.Authenticator.get()
3713 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003714 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003715 'This command is not designed for bot environment. It checks '
3716 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003717 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3718 if isinstance(authn, gerrit_util.GceAuthenticator):
3719 message += (
3720 '\n'
3721 'If you need to run this on GCE or a cloudtop instance, '
3722 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3723 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003724
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003725 checker = _GitCookiesChecker()
3726 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003727
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003728 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003729 checker.print_current_creds(include_netrc=True)
3730
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003731 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003732 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003733 return 0
3734 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003735
3736
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003737@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003738def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003739 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003740 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003741 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003742 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003743 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003744 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003745 return RunGit(['config', 'branch.%s.base-url' % branch],
3746 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003747
3748 print('Setting base-url to %s' % args[0])
3749 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3750 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003751
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003752
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003753def color_for_status(status):
3754 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003755 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003756 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003757 'unsent': BOLD + Fore.YELLOW,
3758 'waiting': BOLD + Fore.RED,
3759 'reply': BOLD + Fore.YELLOW,
3760 'not lgtm': BOLD + Fore.RED,
3761 'lgtm': BOLD + Fore.GREEN,
3762 'commit': BOLD + Fore.MAGENTA,
3763 'closed': BOLD + Fore.CYAN,
3764 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003765 }.get(status, Fore.WHITE)
3766
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003767
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003768def get_cl_statuses(changes, fine_grained, max_processes=None):
3769 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003770
3771 If fine_grained is true, this will fetch CL statuses from the server.
3772 Otherwise, simply indicate if there's a matching url for the given branches.
3773
3774 If max_processes is specified, it is used as the maximum number of processes
3775 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3776 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003777
3778 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003779 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003780 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003781 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003782
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003783 if not fine_grained:
3784 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003785 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003786 for cl in changes:
3787 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003788 return
3789
3790 # First, sort out authentication issues.
3791 logging.debug('ensuring credentials exist')
3792 for cl in changes:
3793 cl.EnsureAuthenticated(force=False, refresh=True)
3794
3795 def fetch(cl):
3796 try:
3797 return (cl, cl.GetStatus())
3798 except:
3799 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003800 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003801 raise
3802
3803 threads_count = len(changes)
3804 if max_processes:
3805 threads_count = max(1, min(threads_count, max_processes))
3806 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3807
Edward Lemur61bf4172020-02-24 23:22:37 +00003808 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003809 fetched_cls = set()
3810 try:
3811 it = pool.imap_unordered(fetch, changes).__iter__()
3812 while True:
3813 try:
3814 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003815 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003816 break
3817 fetched_cls.add(cl)
3818 yield cl, status
3819 finally:
3820 pool.close()
3821
3822 # Add any branches that failed to fetch.
3823 for cl in set(changes) - fetched_cls:
3824 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003825
rmistry@google.com2dd99862015-06-22 12:22:18 +00003826
Jose Lopes3863fc52020-04-07 17:00:25 +00003827def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003828 """Uploads CLs of local branches that are dependents of the current branch.
3829
3830 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003831
3832 test1 -> test2.1 -> test3.1
3833 -> test3.2
3834 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835
3836 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3837 run on the dependent branches in this order:
3838 test2.1, test3.1, test3.2, test2.2, test3.3
3839
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003840 Note: This function does not rebase your local dependent branches. Use it
3841 when you make a change to the parent branch that will not conflict
3842 with its dependent branches, and you would like their dependencies
3843 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844 """
3845 if git_common.is_dirty_git_tree('upload-branch-deps'):
3846 return 1
3847
3848 root_branch = cl.GetBranch()
3849 if root_branch is None:
3850 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3851 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003852 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003853 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3854 'patchset dependencies without an uploaded CL.')
3855
3856 branches = RunGit(['for-each-ref',
3857 '--format=%(refname:short) %(upstream:short)',
3858 'refs/heads'])
3859 if not branches:
3860 print('No local branches found.')
3861 return 0
3862
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003863 # Create a dictionary of all local branches to the branches that are
3864 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003865 tracked_to_dependents = collections.defaultdict(list)
3866 for b in branches.splitlines():
3867 tokens = b.split()
3868 if len(tokens) == 2:
3869 branch_name, tracked = tokens
3870 tracked_to_dependents[tracked].append(branch_name)
3871
vapiera7fbd5a2016-06-16 09:17:49 -07003872 print()
3873 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003874 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003875
rmistry@google.com2dd99862015-06-22 12:22:18 +00003876 def traverse_dependents_preorder(branch, padding=''):
3877 dependents_to_process = tracked_to_dependents.get(branch, [])
3878 padding += ' '
3879 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003880 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003881 dependents.append(dependent)
3882 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003883
rmistry@google.com2dd99862015-06-22 12:22:18 +00003884 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003886
3887 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003889 return 0
3890
rmistry@google.com2dd99862015-06-22 12:22:18 +00003891 # Record all dependents that failed to upload.
3892 failures = {}
3893 # Go through all dependents, checkout the branch and upload.
3894 try:
3895 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print()
3897 print('--------------------------------------')
3898 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003899 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003901 try:
3902 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003904 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003905 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003906 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 finally:
3909 # Swap back to the original root branch.
3910 RunGit(['checkout', '-q', root_branch])
3911
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print()
3913 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003914 for dependent_branch in dependents:
3915 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print(' %s : %s' % (dependent_branch, upload_status))
3917 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003918
3919 return 0
3920
3921
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003922def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003923 """Given a proposed tag name, returns a tag name that is guaranteed to be
3924 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3925 or 'foo-3', and so on."""
3926
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003927 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003928 for suffix_num in itertools.count(1):
3929 if suffix_num == 1:
3930 to_check = proposed_tag
3931 else:
3932 to_check = '%s-%d' % (proposed_tag, suffix_num)
3933
3934 if to_check not in existing_tags:
3935 return to_check
3936
3937
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003938@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003939def CMDarchive(parser, args):
3940 """Archives and deletes branches associated with closed changelists."""
3941 parser.add_option(
3942 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003943 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003944 parser.add_option(
3945 '-f', '--force', action='store_true',
3946 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003947 parser.add_option(
3948 '-d', '--dry-run', action='store_true',
3949 help='Skip the branch tagging and removal steps.')
3950 parser.add_option(
3951 '-t', '--notags', action='store_true',
3952 help='Do not tag archived branches. '
3953 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003954 parser.add_option(
3955 '-p',
3956 '--pattern',
3957 default='git-cl-archived-{issue}-{branch}',
3958 help='Format string for archive tags. '
3959 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003960
kmarshall3bff56b2016-06-06 18:31:47 -07003961 options, args = parser.parse_args(args)
3962 if args:
3963 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003964
3965 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3966 if not branches:
3967 return 0
3968
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003969 tags = RunGit(['for-each-ref', '--format=%(refname)',
3970 'refs/tags']).splitlines() or []
3971 tags = [t.split('/')[-1] for t in tags]
3972
vapiera7fbd5a2016-06-16 09:17:49 -07003973 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003974 changes = [Changelist(branchref=b)
3975 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003976 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3977 statuses = get_cl_statuses(changes,
3978 fine_grained=True,
3979 max_processes=options.maxjobs)
3980 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003981 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3982 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003983 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003984 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003985 proposal.sort()
3986
3987 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003988 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003989 return 0
3990
Edward Lemur85153282020-02-14 22:06:29 +00003991 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003992
vapiera7fbd5a2016-06-16 09:17:49 -07003993 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003994 if options.notags:
3995 for next_item in proposal:
3996 print(' ' + next_item[0])
3997 else:
3998 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3999 for next_item in proposal:
4000 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004001
kmarshall9249e012016-08-23 12:02:16 -07004002 # Quit now on precondition failure or if instructed by the user, either
4003 # via an interactive prompt or by command line flags.
4004 if options.dry_run:
4005 print('\nNo changes were made (dry run).\n')
4006 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004007
4008 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004009 print('You are currently on a branch \'%s\' which is associated with a '
4010 'closed codereview issue, so archive cannot proceed. Please '
4011 'checkout another branch and run this command again.' %
4012 current_branch)
4013 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004014
4015 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004016 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004017 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004018 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004019 return 1
4020
4021 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004022 if not options.notags:
4023 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004024
4025 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4026 # Clean up the tag if we failed to delete the branch.
4027 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004028
vapiera7fbd5a2016-06-16 09:17:49 -07004029 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004030
4031 return 0
4032
4033
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004034@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004035def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004036 """Show status of changelists.
4037
4038 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004039 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004040 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004041 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004042 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004043 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004044 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004045 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004046
4047 Also see 'git cl comments'.
4048 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004049 parser.add_option(
4050 '--no-branch-color',
4051 action='store_true',
4052 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004054 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004055 parser.add_option('-f', '--fast', action='store_true',
4056 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004057 parser.add_option(
4058 '-j', '--maxjobs', action='store', type=int,
4059 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004060 parser.add_option(
4061 '-i', '--issue', type=int,
4062 help='Operate on this issue instead of the current branch\'s implicit '
4063 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004064 parser.add_option('-d',
4065 '--date-order',
4066 action='store_true',
4067 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004068 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004069 if args:
4070 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071
iannuccie53c9352016-08-17 14:40:40 -07004072 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004073 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004074
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004076 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004077 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004078 if cl.GetIssue():
4079 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004080 elif options.field == 'id':
4081 issueid = cl.GetIssue()
4082 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004084 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004085 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004086 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004088 elif options.field == 'status':
4089 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090 elif options.field == 'url':
4091 url = cl.GetIssueURL()
4092 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004094 return 0
4095
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004096 branches = RunGit([
4097 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4098 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004099 if not branches:
4100 print('No local branch found.')
4101 return 0
4102
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004103 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004104 Changelist(branchref=b, commit_date=ct)
4105 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4106 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004107 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004108 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004109 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004110 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004111
Edward Lemur85153282020-02-14 22:06:29 +00004112 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004113
4114 def FormatBranchName(branch, colorize=False):
4115 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4116 an asterisk when it is the current branch."""
4117
4118 asterisk = ""
4119 color = Fore.RESET
4120 if branch == current_branch:
4121 asterisk = "* "
4122 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004123 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004124
4125 if colorize:
4126 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004127 return asterisk + branch_name
4128
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004129 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004130
4131 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004132
4133 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004134 sorted_changes = sorted(changes,
4135 key=lambda c: c.GetCommitDate(),
4136 reverse=True)
4137 else:
4138 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4139 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004140 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004141 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004142 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004143 branch_statuses[c.GetBranch()] = status
4144 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004145 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004146 if url and (not status or status == 'error'):
4147 # The issue probably doesn't exist anymore.
4148 url += ' (broken)'
4149
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004150 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004151 # Turn off bold as well as colors.
4152 END = '\033[0m'
4153 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004154 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004155 color = ''
4156 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004157 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004158
Alan Cuttera3be9a52019-03-04 18:50:33 +00004159 branch_display = FormatBranchName(branch)
4160 padding = ' ' * (alignment - len(branch_display))
4161 if not options.no_branch_color:
4162 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004163
Alan Cuttera3be9a52019-03-04 18:50:33 +00004164 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4165 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004166
vapiera7fbd5a2016-06-16 09:17:49 -07004167 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004168 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004169 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004170 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004171 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004172 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004173 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004174 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004175 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004176 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004178 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004179 return 0
4180
4181
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004182def colorize_CMDstatus_doc():
4183 """To be called once in main() to add colors to git cl status help."""
4184 colors = [i for i in dir(Fore) if i[0].isupper()]
4185
4186 def colorize_line(line):
4187 for color in colors:
4188 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004189 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004190 indent = len(line) - len(line.lstrip(' ')) + 1
4191 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4192 return line
4193
4194 lines = CMDstatus.__doc__.splitlines()
4195 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4196
4197
phajdan.jre328cf92016-08-22 04:12:17 -07004198def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004199 if path == '-':
4200 json.dump(contents, sys.stdout)
4201 else:
4202 with open(path, 'w') as f:
4203 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004204
4205
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004206@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004207@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004209 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004210
4211 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004212 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004213 parser.add_option('-r', '--reverse', action='store_true',
4214 help='Lookup the branch(es) for the specified issues. If '
4215 'no issues are specified, all branches with mapped '
4216 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004217 parser.add_option('--json',
4218 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004219 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004220
dnj@chromium.org406c4402015-03-03 17:22:28 +00004221 if options.reverse:
4222 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004223 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004224 # Reverse issue lookup.
4225 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004226
4227 git_config = {}
4228 for config in RunGit(['config', '--get-regexp',
4229 r'branch\..*issue']).splitlines():
4230 name, _space, val = config.partition(' ')
4231 git_config[name] = val
4232
dnj@chromium.org406c4402015-03-03 17:22:28 +00004233 for branch in branches:
Edward Lesmes50da7702020-03-30 19:23:43 +00004234 issue = git_config.get(
4235 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
Edward Lemur52969c92020-02-06 18:15:28 +00004236 if issue:
4237 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004238 if not args:
Carlos Caballero81923d62020-07-06 18:22:27 +00004239 args = sorted(issue_branch_map.keys())
phajdan.jre328cf92016-08-22 04:12:17 -07004240 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004241 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004242 try:
4243 issue_num = int(issue)
4244 except ValueError:
4245 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004246 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004247 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004248 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004249 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004250 if options.json:
4251 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004252 return 0
4253
4254 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004255 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004256 if not issue.valid:
4257 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4258 'or no argument to list it.\n'
4259 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004260 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004261 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004262 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004263 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004264 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4265 if options.json:
4266 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004267 'gerrit_host': cl.GetGerritHost(),
4268 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004269 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004270 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004271 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004272 return 0
4273
4274
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004275@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004276def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004277 """Shows or posts review comments for any changelist."""
4278 parser.add_option('-a', '--add-comment', dest='comment',
4279 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004280 parser.add_option('-p', '--publish', action='store_true',
4281 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004282 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004283 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004284 parser.add_option('-m', '--machine-readable', dest='readable',
4285 action='store_false', default=True,
4286 help='output comments in a format compatible with '
4287 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004288 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004289 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004290 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004291
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004292 issue = None
4293 if options.issue:
4294 try:
4295 issue = int(options.issue)
4296 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004297 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004298
Edward Lemur934836a2019-09-09 20:16:54 +00004299 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300
4301 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004302 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004303 return 0
4304
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004305 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4306 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004307 for comment in summary:
4308 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004309 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004310 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004311 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004312 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004313 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004314 elif comment.autogenerated:
4315 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004316 else:
4317 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004318 print('\n%s%s %s%s\n%s' % (
4319 color,
4320 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4321 comment.sender,
4322 Fore.RESET,
4323 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4324
smut@google.comc85ac942015-09-15 16:34:43 +00004325 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004326 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004327 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004328 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4329 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004330 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004331 return 0
4332
4333
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004334@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004335@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004336def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004337 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004338 parser.add_option('-d', '--display', action='store_true',
4339 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004340 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004341 help='New description to set for this issue (- for stdin, '
4342 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004343 parser.add_option('-f', '--force', action='store_true',
4344 help='Delete any unpublished Gerrit edits for this issue '
4345 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004346
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004347 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004348
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004349 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004350 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004351 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004352 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004353 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004354
Edward Lemur934836a2019-09-09 20:16:54 +00004355 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004356 if target_issue_arg:
4357 kwargs['issue'] = target_issue_arg.issue
4358 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004359
4360 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004361 if not cl.GetIssue():
4362 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004363
Edward Lemur678a6842019-10-03 22:25:05 +00004364 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004365 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004366
Edward Lemur6c6827c2020-02-06 21:15:18 +00004367 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004368
smut@google.com34fb6b12015-07-13 20:03:26 +00004369 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004370 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004371 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004372
4373 if options.new_description:
4374 text = options.new_description
4375 if text == '-':
4376 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004377 elif text == '+':
4378 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004379 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004380
4381 description.set_description(text)
4382 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004383 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004384 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004385 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004386 return 0
4387
4388
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004389@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004390def CMDlint(parser, args):
4391 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004392 parser.add_option('--filter', action='append', metavar='-x,+y',
4393 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004394 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004395
4396 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004397 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004398 try:
4399 import cpplint
4400 import cpplint_chromium
4401 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004402 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004403 return 1
4404
4405 # Change the current working directory before calling lint so that it
4406 # shows the correct base.
4407 previous_cwd = os.getcwd()
4408 os.chdir(settings.GetRoot())
4409 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004410 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004411 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004412 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004413 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004414 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004415
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004416 # Process cpplint arguments, if any.
4417 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4418 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004419 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004420
Lei Zhang379d1ad2020-07-15 19:40:06 +00004421 include_regex = re.compile(settings.GetLintRegex())
4422 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004423 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4424 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004425 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004426 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004427 continue
4428
4429 if ignore_regex.match(filename):
4430 print('Ignoring file %s' % filename)
4431 continue
4432
4433 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4434 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004435 finally:
4436 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004437 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004438 if cpplint._cpplint_state.error_count != 0:
4439 return 1
4440 return 0
4441
4442
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004443@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004444def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004445 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004446 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004447 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004448 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004449 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004450 parser.add_option('--all', action='store_true',
4451 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004452 parser.add_option('--files',
4453 nargs=1,
4454 help='Semicolon-separated list of files to be marked as '
4455 'modified when executing presubmit or post-upload hooks. '
4456 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004457 parser.add_option('--parallel', action='store_true',
4458 help='Run all tests specified by input_api.RunTests in all '
4459 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004460 parser.add_option('--resultdb', action='store_true',
4461 help='Run presubmit checks in the ResultSink environment '
4462 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004463 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004464 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465
sbc@chromium.org71437c02015-04-09 19:29:40 +00004466 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004467 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468 return 1
4469
Edward Lemur934836a2019-09-09 20:16:54 +00004470 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004471 if args:
4472 base_branch = args[0]
4473 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004474 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004475 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004476
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004477 start = time.time()
4478 try:
4479 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4480 description = cl.FetchDescription()
4481 else:
4482 description = _create_description_from_log([base_branch])
4483 except Exception as e:
4484 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004485 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004486 elapsed = time.time() - start
4487 if elapsed > 5:
4488 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004489
Bruce Dawson13acea32022-05-03 22:13:08 +00004490 if not base_branch:
4491 if not options.force:
4492 print('use --force to check even when not on a branch.')
4493 return 1
4494 base_branch = 'HEAD'
4495
Josip Sokcevic017544d2022-03-31 23:47:53 +00004496 cl.RunHook(committing=not options.upload,
4497 may_prompt=False,
4498 verbose=options.verbose,
4499 parallel=options.parallel,
4500 upstream=base_branch,
4501 description=description,
4502 all_files=options.all,
4503 files=options.files,
4504 resultdb=options.resultdb,
4505 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004506 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004507
4508
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004509def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004510 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004511
4512 Works the same way as
4513 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4514 but can be called on demand on all platforms.
4515
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004516 The basic idea is to generate git hash of a state of the tree, original
4517 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004518 """
4519 lines = []
4520 tree_hash = RunGitSilent(['write-tree'])
4521 lines.append('tree %s' % tree_hash.strip())
4522 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4523 if code == 0:
4524 lines.append('parent %s' % parent.strip())
4525 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4526 lines.append('author %s' % author.strip())
4527 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4528 lines.append('committer %s' % committer.strip())
4529 lines.append('')
4530 # Note: Gerrit's commit-hook actually cleans message of some lines and
4531 # whitespace. This code is not doing this, but it clearly won't decrease
4532 # entropy.
4533 lines.append(message)
4534 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004535 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004536 return 'I%s' % change_hash.strip()
4537
4538
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004539def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004540 """Computes the remote branch ref to use for the CL.
4541
4542 Args:
4543 remote (str): The git remote for the CL.
4544 remote_branch (str): The git remote branch for the CL.
4545 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004546 """
4547 if not (remote and remote_branch):
4548 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004549
wittman@chromium.org455dc922015-01-26 20:15:50 +00004550 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004551 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004552 # refs, which are then translated into the remote full symbolic refs
4553 # below.
4554 if '/' not in target_branch:
4555 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4556 else:
4557 prefix_replacements = (
4558 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4559 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4560 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4561 )
4562 match = None
4563 for regex, replacement in prefix_replacements:
4564 match = re.search(regex, target_branch)
4565 if match:
4566 remote_branch = target_branch.replace(match.group(0), replacement)
4567 break
4568 if not match:
4569 # This is a branch path but not one we recognize; use as-is.
4570 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004571 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004572 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004573 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004574 # Handle the refs that need to land in different refs.
4575 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004576
wittman@chromium.org455dc922015-01-26 20:15:50 +00004577 # Create the true path to the remote branch.
4578 # Does the following translation:
4579 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004580 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004581 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4582 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4583 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4584 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4585 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4586 'refs/heads/')
4587 elif remote_branch.startswith('refs/remotes/branch-heads'):
4588 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004589
wittman@chromium.org455dc922015-01-26 20:15:50 +00004590 return remote_branch
4591
4592
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004593def cleanup_list(l):
4594 """Fixes a list so that comma separated items are put as individual items.
4595
4596 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4597 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4598 """
4599 items = sum((i.split(',') for i in l), [])
4600 stripped_items = (i.strip() for i in items)
4601 return sorted(filter(None, stripped_items))
4602
4603
Aaron Gable4db38df2017-11-03 14:59:07 -07004604@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004605@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004606def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004607 """Uploads the current changelist to codereview.
4608
4609 Can skip dependency patchset uploads for a branch by running:
4610 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004611 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004612 git config --unset branch.branch_name.skip-deps-uploads
4613 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004614
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004615 If the name of the checked out branch starts with "bug-" or "fix-" followed
4616 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004617 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004618
4619 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004620 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004621 [git-cl] add support for hashtags
4622 Foo bar: implement foo
4623 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004624 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004625 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4626 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004627 parser.add_option('--bypass-watchlists', action='store_true',
4628 dest='bypass_watchlists',
4629 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004630 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004631 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004632 parser.add_option('--message', '-m', dest='message',
4633 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004634 parser.add_option('-b', '--bug',
4635 help='pre-populate the bug number(s) for this issue. '
4636 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004637 parser.add_option('--message-file', dest='message_file',
4638 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004639 parser.add_option('--title', '-t', dest='title',
4640 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004641 parser.add_option('-T', '--skip-title', action='store_true',
4642 dest='skip_title',
4643 help='Use the most recent commit message as the title of '
4644 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004645 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004646 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004647 help='reviewer email addresses')
4648 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004649 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004650 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004651 parser.add_option('--hashtag', dest='hashtags',
4652 action='append', default=[],
4653 help=('Gerrit hashtag for new CL; '
4654 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004655 parser.add_option('-s',
4656 '--send-mail',
4657 '--send-email',
4658 dest='send_mail',
4659 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004660 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004661 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004662 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004663 metavar='TARGET',
4664 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004665 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004666 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004667 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004668 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004669 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004670 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004671 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004672 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4673 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004674 parser.add_option('-c',
4675 '--use-commit-queue',
4676 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004677 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004678 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004679 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004680 parser.add_option('-d', '--cq-dry-run',
4681 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004682 help='Send the patchset to do a CQ dry run right after '
4683 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004684 parser.add_option(
4685 '-q',
4686 '--cq-quick-run',
4687 action='store_true',
4688 default=False,
4689 help='Send the patchset to do a CQ quick run right after '
4690 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4691 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004692 parser.add_option('--set-bot-commit', action='store_true',
4693 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004694 parser.add_option('--preserve-tryjobs', action='store_true',
4695 help='instruct the CQ to let tryjobs running even after '
4696 'new patchsets are uploaded instead of canceling '
4697 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004698 parser.add_option('--dependencies', action='store_true',
4699 help='Uploads CLs of all the local branches that depend on '
4700 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004701 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4702 help='Sends your change to the CQ after an approval. Only '
4703 'works on repos that have the Auto-Submit label '
4704 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004705 parser.add_option('--parallel', action='store_true',
4706 help='Run all tests specified by input_api.RunTests in all '
4707 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004708 parser.add_option('--no-autocc', action='store_true',
4709 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004710 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004711 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004712 parser.add_option('-R', '--retry-failed', action='store_true',
4713 help='Retry failed tryjobs from old patchset immediately '
4714 'after uploading new patchset. Cannot be used with '
4715 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004716 parser.add_option('--fixed', '-x',
4717 help='List of bugs that will be commented on and marked '
4718 'fixed (pre-populates "Fixed:" tag). Same format as '
4719 '-b option / "Bug:" tag. If fixing several issues, '
4720 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004721 parser.add_option('--edit-description', action='store_true', default=False,
4722 help='Modify description before upload. Cannot be used '
4723 'with --force. It is a noop when --no-squash is set '
4724 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004725 parser.add_option('--git-completion-helper', action="store_true",
4726 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004727 parser.add_option('-o',
4728 '--push-options',
4729 action='append',
4730 default=[],
4731 help='Transmit the given string to the server when '
4732 'performing git push (pass-through). See git-push '
4733 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004734 parser.add_option('--no-add-changeid',
4735 action='store_true',
4736 dest='no_add_changeid',
4737 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004738 parser.add_option('--no-python2-post-upload-hooks',
4739 action='store_true',
4740 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004741 parser.add_option('--cherry-pick-stacked',
4742 '--cp',
4743 dest='cherry_pick_stacked',
4744 action='store_true',
4745 help='If parent branch has un-uploaded updates, '
4746 'automatically skip parent branches and just upload '
4747 'the current branch cherry-pick on its parent\'s last '
4748 'uploaded commit. Allows users to skip the potential '
4749 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004750 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004751
rmistry@google.com2dd99862015-06-22 12:22:18 +00004752 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004753 (options, args) = parser.parse_args(args)
4754
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004755 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004756 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4757 if opt.help != optparse.SUPPRESS_HELP))
4758 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004759
sbc@chromium.org71437c02015-04-09 19:29:40 +00004760 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004761 return 1
4762
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004763 options.reviewers = cleanup_list(options.reviewers)
4764 options.cc = cleanup_list(options.cc)
4765
Josipe827b0f2020-01-30 00:07:20 +00004766 if options.edit_description and options.force:
4767 parser.error('Only one of --force and --edit-description allowed')
4768
tandriib80458a2016-06-23 12:20:07 -07004769 if options.message_file:
4770 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004771 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004772 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004773
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004774 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004775 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004776 options.use_commit_queue,
4777 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004778 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4779 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004780
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004781 if options.skip_title and options.title:
4782 parser.error('Only one of --title and --skip-title allowed.')
4783
Aaron Gableedbc4132017-09-11 13:22:28 -07004784 if options.use_commit_queue:
4785 options.send_mail = True
4786
Edward Lesmes0dd54822020-03-26 18:24:25 +00004787 if options.squash is None:
4788 # Load default for user, repo, squash=true, in this order.
4789 options.squash = settings.GetSquashGerritUploads()
4790
Joanna Wang5051ffe2023-03-01 22:24:07 +00004791 cl = Changelist(branchref=options.target_branch)
4792
4793 # Warm change details cache now to avoid RPCs later, reducing latency for
4794 # developers.
4795 if cl.GetIssue():
4796 cl._GetChangeDetail(
4797 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4798
4799 if options.retry_failed and not cl.GetIssue():
4800 print('No previous patchsets, so --retry-failed has no effect.')
4801 options.retry_failed = False
4802
4803 remote = cl.GetRemoteUrl()
Joanna Wang892f2ce2023-03-14 21:39:47 +00004804 dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR)
Joanna Wang5051ffe2023-03-01 22:24:07 +00004805 not in ['1', '0']
4806 and any(repo in remote
4807 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4808
4809 if dogfood_stacked_changes:
4810 print('This repo has been enrolled in the stacked changes dogfood. '
4811 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4812 'File bugs at https://bit.ly/3Y6opoI')
4813
4814 if options.squash and (dogfood_stacked_changes
Joanna Wang892f2ce2023-03-14 21:39:47 +00004815 or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'):
Joanna Wangdd12deb2023-01-26 20:43:28 +00004816 if options.dependencies:
4817 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004818
Joanna Wangd75fc882023-03-01 21:53:34 +00004819 if options.cherry_pick_stacked:
4820 try:
4821 orig_args.remove('--cherry-pick-stacked')
4822 except ValueError:
4823 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004824 UploadAllSquashed(options, orig_args)
4825 return 0
4826
Joanna Wangd75fc882023-03-01 21:53:34 +00004827 if options.cherry_pick_stacked:
4828 parser.error('--cherry-pick-stacked is not available for this workflow.')
4829
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004830 # cl.GetMostRecentPatchset uses cached information, and can return the last
4831 # patchset before upload. Calling it here makes it clear that it's the
4832 # last patchset before upload. Note that GetMostRecentPatchset will fail
4833 # if no CL has been uploaded yet.
4834 if options.retry_failed:
4835 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004836
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004837 ret = cl.CMDUpload(options, args, orig_args)
4838
4839 if options.retry_failed:
4840 if ret != 0:
4841 print('Upload failed, so --retry-failed has no effect.')
4842 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004843 builds, _ = _fetch_latest_builds(cl,
4844 DEFAULT_BUILDBUCKET_HOST,
4845 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004846 jobs = _filter_failed_for_retry(builds)
4847 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004848 print('No failed tryjobs, so --retry-failed has no effect.')
4849 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004850 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004851
4852 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004853
4854
Joanna Wang18de1f62023-01-21 01:24:24 +00004855def UploadAllSquashed(options, orig_args):
4856 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4857 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004858 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004859
Joanna Wangc710e2d2023-01-25 14:53:22 +00004860 # Create commits.
4861 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4862 if cherry_pick_current:
4863 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4864 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4865 uploads_by_cl.append((cls[0], new_upload))
4866 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004867 ordered_cls = list(reversed(cls))
4868
Joanna Wang6215dd02023-02-07 15:58:03 +00004869 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004870 # We can only support external changes when we're only uploading one
4871 # branch.
4872 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
4873 if parent is None:
4874 origin = '.'
4875 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004876
Joanna Wang7603f042023-03-01 22:17:36 +00004877 while origin == '.':
4878 # Search for cl's closest ancestor with a gerrit hash.
4879 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4880 if origin == '.':
4881 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4882
4883 # Support the `git merge` and `git pull` workflow.
4884 if upstream_branch in ['master', 'main']:
4885 parent = cl.GetCommonAncestorWithUpstream()
4886 else:
4887 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4888 upstream_branch,
4889 GERRIT_SQUASH_HASH_CONFIG_KEY)
4890 if parent:
4891 break
4892 branch = upstream_branch
4893 else:
4894 # Either the root of the tree is the cl's direct parent and the while
4895 # loop above only found empty branches between cl and the root of the
4896 # tree.
4897 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004898
Joanna Wangc710e2d2023-01-25 14:53:22 +00004899 for i, cl in enumerate(ordered_cls):
4900 # If we're in the middle of the stack, set end_commit to downstream's
4901 # direct ancestor.
4902 if i + 1 < len(ordered_cls):
4903 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4904 else:
4905 child_base_commit = None
4906 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004907 parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004908 end_commit=child_base_commit)
4909 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004910 parent = new_upload.commit_to_push
4911
4912 # Create refspec options
4913 cl, new_upload = uploads_by_cl[-1]
4914 refspec_opts = cl._GetRefSpecOptions(
4915 options,
4916 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004917 multi_change_upload=len(uploads_by_cl) > 1,
4918 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004919 refspec_suffix = ''
4920 if refspec_opts:
4921 refspec_suffix = '%' + ','.join(refspec_opts)
4922 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4923 refspec_suffix)
4924
4925 remote, remote_branch = cl.GetRemoteBranch()
4926 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4927 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4928 refspec_suffix)
4929
4930 # Git push
4931 git_push_metadata = {
4932 'gerrit_host':
4933 cl.GetGerritHost(),
4934 'title':
4935 options.title or '<untitled>',
4936 'change_id':
4937 git_footers.get_footer_change_id(new_upload.change_desc.description),
4938 'description':
4939 new_upload.change_desc.description,
4940 }
4941 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004942 git_push_metadata,
4943 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004944
4945 # Post push updates
4946 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4947 change_numbers = [
4948 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4949 ]
4950
4951 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4952 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4953
4954 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004955
4956
4957def _UploadAllPrecheck(options, orig_args):
4958 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4959 """Checks the state of the tree and gives the user uploading options
4960
4961 Returns: A tuple of the ordered list of changes that have new commits
4962 since their last upload and a boolean of whether the user wants to
4963 cherry-pick and upload the current branch instead of uploading all cls.
4964 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004965 cl = Changelist()
4966 if cl.GetBranch() is None:
4967 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4968
Joanna Wang18de1f62023-01-21 01:24:24 +00004969 branch_ref = None
4970 cls = []
4971 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004972 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004973
4974 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4975
4976 while True:
4977 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4978 DieWithError(
4979 'More than %s branches in the stack have not been uploaded.\n'
4980 'Are your branches in a misconfigured state?\n'
4981 'If not, please upload some upstream changes first.' %
4982 (_MAX_STACKED_BRANCHES_UPLOAD))
4983
4984 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004985
Joanna Wang6215dd02023-02-07 15:58:03 +00004986 # Only add CL if it has anything to commit.
4987 base_commit = cl.GetCommonAncestorWithUpstream()
4988 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4989
4990 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4991 if diff:
4992 cls.append(cl)
4993 if (not first_pass and
4994 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4995 # We are mid-stack and the user must upload their upstream branches.
4996 must_upload_upstream = True
4997 elif first_pass: # The current branch has nothing to commit. Exit.
4998 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4999 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5000 first_pass = False
5001
5002 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005003 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005004 branch_ref = upstream_branch_ref # set branch for next run.
5005
Joanna Wang6215dd02023-02-07 15:58:03 +00005006 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5007 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5008 upstream_branch,
5009 LAST_UPLOAD_HASH_CONFIG_KEY)
5010
Joanna Wang18de1f62023-01-21 01:24:24 +00005011 # Case 1: We've reached the beginning of the tree.
5012 if origin != '.':
5013 break
5014
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005016 # the user MUST upload them unless they are empty. Continue to
5017 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005018 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005019 continue
5020
Joanna Wang18de1f62023-01-21 01:24:24 +00005021 # Case 3: If upstream's last_upload == cl.base_commit we do
5022 # not need to upload any more upstreams from this point on.
5023 # (Even if there may be diverged branches higher up the tree)
5024 if base_commit == upstream_last_upload:
5025 break
5026
5027 # Case 4: If upstream's last_upload < cl.base_commit we are
5028 # uploading cl and upstream_cl.
5029 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005030 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 continue
5032
5033 # Case 5: If cl.base_commit < upstream's last_upload the user
5034 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005035 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005036 DieWithError(
5037 'At least one branch in the stack has diverged from its upstream '
5038 'branch and does not contain its upstream\'s last upload.\n'
5039 'Please rebase the stack with `git rebase-update` before uploading.')
5040
5041 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5042 # any relation to commits in the tree. Continue up the tree until we hit
5043 # the root.
5044
5045 # We assume all cls in the stack have the same auth requirements and only
5046 # check this once.
5047 cls[0].EnsureAuthenticated(force=options.force)
5048
5049 cherry_pick = False
5050 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005051 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005052 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005053 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005054 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005055 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005056 msg = ('At least one parent branch in `%s` has never been uploaded '
5057 'and must be uploaded before/with `%s`.\n' %
5058 (branches, cls[1].branch))
5059 if options.cherry_pick_stacked:
5060 DieWithError(msg)
5061 if not options.force:
5062 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005063 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005064 if options.cherry_pick_stacked:
5065 print('cherry-picking `%s` on %s\'s last upload' %
5066 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005067 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005068 elif not options.force:
5069 answer = gclient_utils.AskForData(
5070 '\n' + opt_message +
5071 'Press enter to update branches %s.\nOr type `n` to upload only '
5072 '`%s` cherry-picked on %s\'s last upload:' %
5073 (branches, cls[0].branch, cls[1].branch))
5074 if answer.lower() == 'n':
5075 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005076 return cls, cherry_pick
5077
5078
Francois Dorayd42c6812017-05-30 15:10:20 -04005079@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005080@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005081def CMDsplit(parser, args):
5082 """Splits a branch into smaller branches and uploads CLs.
5083
5084 Creates a branch and uploads a CL for each group of files modified in the
5085 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005086 comment, the string '$directory', is replaced with the directory containing
5087 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005088 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005089 parser.add_option('-d', '--description', dest='description_file',
5090 help='A text file containing a CL description in which '
5091 '$directory will be replaced by each CL\'s directory.')
5092 parser.add_option('-c', '--comment', dest='comment_file',
5093 help='A text file containing a CL comment.')
5094 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005095 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005096 help='List the files and reviewers for each CL that would '
5097 'be created, but don\'t create branches or CLs.')
5098 parser.add_option('--cq-dry-run', action='store_true',
5099 help='If set, will do a cq dry run for each uploaded CL. '
5100 'Please be careful when doing this; more than ~10 CLs '
5101 'has the potential to overload our build '
5102 'infrastructure. Try to upload these not during high '
5103 'load times (usually 11-3 Mountain View time). Email '
5104 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005105 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5106 default=True,
5107 help='Sends your change to the CQ after an approval. Only '
5108 'works on repos that have the Auto-Submit label '
5109 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005110 parser.add_option('--max-depth',
5111 type='int',
5112 default=0,
5113 help='The max depth to look for OWNERS files. Useful for '
5114 'controlling the granularity of the split CLs, e.g. '
5115 '--max-depth=1 will only split by top-level '
5116 'directory. Specifying a value less than 1 means no '
5117 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005118 options, _ = parser.parse_args(args)
5119
5120 if not options.description_file:
5121 parser.error('No --description flag specified.')
5122
5123 def WrappedCMDupload(args):
5124 return CMDupload(OptionParser(), args)
5125
Daniel Cheng403c44e2022-10-05 22:24:58 +00005126 return split_cl.SplitCl(options.description_file, options.comment_file,
5127 Changelist, WrappedCMDupload, options.dry_run,
5128 options.cq_dry_run, options.enable_auto_submit,
5129 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005130
5131
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005132@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005133@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005134def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005135 """DEPRECATED: Used to commit the current changelist via git-svn."""
5136 message = ('git-cl no longer supports committing to SVN repositories via '
5137 'git-svn. You probably want to use `git cl land` instead.')
5138 print(message)
5139 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005140
5141
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005142@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005143@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005144def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005145 """Commits the current changelist via git.
5146
5147 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5148 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005149 """
5150 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5151 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005152 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005153 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005154 parser.add_option('--parallel', action='store_true',
5155 help='Run all tests specified by input_api.RunTests in all '
5156 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005157 parser.add_option('--resultdb', action='store_true',
5158 help='Run presubmit checks in the ResultSink environment '
5159 'and send results to the ResultDB database.')
5160 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005161 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005162
Edward Lemur934836a2019-09-09 20:16:54 +00005163 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005164
Robert Iannucci2e73d432018-03-14 01:10:47 -07005165 if not cl.GetIssue():
5166 DieWithError('You must upload the change first to Gerrit.\n'
5167 ' If you would rather have `git cl land` upload '
5168 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005169 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5170 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005171
5172
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005173@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005174@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005175def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005176 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005177 parser.add_option('-b', dest='newbranch',
5178 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005179 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005180 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005181 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005182 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005183
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005184 group = optparse.OptionGroup(
5185 parser,
5186 'Options for continuing work on the current issue uploaded from a '
5187 'different clone (e.g. different machine). Must be used independently '
5188 'from the other options. No issue number should be specified, and the '
5189 'branch must have an issue number associated with it')
5190 group.add_option('--reapply', action='store_true', dest='reapply',
5191 help='Reset the branch and reapply the issue.\n'
5192 'CAUTION: This will undo any local changes in this '
5193 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005194
5195 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005196 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005197 parser.add_option_group(group)
5198
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005199 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005200
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005201 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005202 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005203 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005204 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005205 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005206
Edward Lemur934836a2019-09-09 20:16:54 +00005207 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005208 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005209 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005210
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005211 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005212 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005213 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005214
5215 RunGit(['reset', '--hard', upstream])
5216 if options.pull:
5217 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005218
Edward Lemur678a6842019-10-03 22:25:05 +00005219 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005220 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5221 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005222
5223 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005224 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005225
Edward Lemurf38bc172019-09-03 21:02:13 +00005226 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005227 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005228 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005229
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005230 # We don't want uncommitted changes mixed up with the patch.
5231 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005232 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005233
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005234 if options.newbranch:
5235 if options.force:
5236 RunGit(['branch', '-D', options.newbranch],
5237 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005238 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005239
Edward Lemur678a6842019-10-03 22:25:05 +00005240 cl = Changelist(
5241 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005242
Edward Lemur678a6842019-10-03 22:25:05 +00005243 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005244 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005245
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005246 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5247 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005248
5249
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005250def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005251 """Fetches the tree status and returns either 'open', 'closed',
5252 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005253 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005255 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256 if status.find('closed') != -1 or status == '0':
5257 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005258
5259 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005261
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005262 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263 return 'unset'
5264
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005265
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266def GetTreeStatusReason():
5267 """Fetches the tree status from a json url and returns the message
5268 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005269 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005270 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005271 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272 status = json.loads(connection.read())
5273 connection.close()
5274 return status['message']
5275
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005276
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005277@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005278def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005279 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005280 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005281 status = GetTreeStatus()
5282 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005283 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 return 2
5285
vapiera7fbd5a2016-06-16 09:17:49 -07005286 print('The tree is %s' % status)
5287 print()
5288 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289 if status != 'open':
5290 return 1
5291 return 0
5292
5293
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005294@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005295def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005296 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5297 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005298 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005299 '-b', '--bot', action='append',
5300 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5301 'times to specify multiple builders. ex: '
5302 '"-b win_rel -b win_layout". See '
5303 'the try server waterfall for the builders name and the tests '
5304 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005305 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005306 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005307 help=('Buildbucket bucket to send the try requests. Format: '
5308 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005309 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005310 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005311 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005312 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005313 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005314 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005315 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005316 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005317 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005318 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005319 '-q',
5320 '--quick-run',
5321 action='store_true',
5322 default=False,
5323 help='trigger in quick run mode '
5324 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5325 'uick_run.md) (chromium only).')
5326 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005327 '--category', default='git_cl_try', help='Specify custom build category.')
5328 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005329 '--project',
5330 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005331 'in recipe to determine to which repository or directory to '
5332 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005333 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005334 '-p', '--property', dest='properties', action='append', default=[],
5335 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005336 'key2=value2 etc. The value will be treated as '
5337 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005338 'NOTE: using this may make your tryjob not usable for CQ, '
5339 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005340 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005341 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5342 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005343 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005344 parser.add_option(
5345 '-R', '--retry-failed', action='store_true', default=False,
5346 help='Retry failed jobs from the latest set of tryjobs. '
5347 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005348 parser.add_option(
5349 '-i', '--issue', type=int,
5350 help='Operate on this issue instead of the current branch\'s implicit '
5351 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005352 options, args = parser.parse_args(args)
5353
machenbach@chromium.org45453142015-09-15 08:45:22 +00005354 # Make sure that all properties are prop=value pairs.
5355 bad_params = [x for x in options.properties if '=' not in x]
5356 if bad_params:
5357 parser.error('Got properties with missing "=": %s' % bad_params)
5358
maruel@chromium.org15192402012-09-06 12:38:29 +00005359 if args:
5360 parser.error('Unknown arguments: %s' % args)
5361
Edward Lemur934836a2019-09-09 20:16:54 +00005362 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005363 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005364 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005365
Edward Lemurf38bc172019-09-03 21:02:13 +00005366 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005367 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005368
tandriie113dfd2016-10-11 10:20:12 -07005369 error_message = cl.CannotTriggerTryJobReason()
5370 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005371 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005372
Edward Lemur45768512020-03-02 19:03:14 +00005373 if options.bot:
5374 if options.retry_failed:
5375 parser.error('--bot is not compatible with --retry-failed.')
5376 if not options.bucket:
5377 parser.error('A bucket (e.g. "chromium/try") is required.')
5378
5379 triggered = [b for b in options.bot if 'triggered' in b]
5380 if triggered:
5381 parser.error(
5382 'Cannot schedule builds on triggered bots: %s.\n'
5383 'This type of bot requires an initial job from a parent (usually a '
5384 'builder). Schedule a job on the parent instead.\n' % triggered)
5385
5386 if options.bucket.startswith('.master'):
5387 parser.error('Buildbot masters are not supported.')
5388
5389 project, bucket = _parse_bucket(options.bucket)
5390 if project is None or bucket is None:
5391 parser.error('Invalid bucket: %s.' % options.bucket)
5392 jobs = sorted((project, bucket, bot) for bot in options.bot)
5393 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005394 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005395 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005396 if options.verbose:
5397 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005398 jobs = _filter_failed_for_retry(builds)
5399 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005400 print('There are no failed jobs in the latest set of jobs '
5401 '(patchset #%d), doing nothing.' % patchset)
5402 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005403 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005404 if num_builders > 10:
5405 confirm_or_exit('There are %d builders with failed builds.'
5406 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005407 elif options.quick_run:
5408 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5409 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005410 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005411 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005412 print('git cl try with no bots now defaults to CQ dry run.')
5413 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5414 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005415
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005416 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005417 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005418 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005419 except BuildbucketResponseException as ex:
5420 print('ERROR: %s' % ex)
5421 return 1
5422 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005423
5424
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005425@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005426def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005427 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005428 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005430 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005431 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005432 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005433 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005434 '--color', action='store_true', default=setup_color.IS_TTY,
5435 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005436 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005437 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5438 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005439 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005440 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005441 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005442 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005443 parser.add_option(
5444 '-i', '--issue', type=int,
5445 help='Operate on this issue instead of the current branch\'s implicit '
5446 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447 options, args = parser.parse_args(args)
5448 if args:
5449 parser.error('Unrecognized args: %s' % ' '.join(args))
5450
Edward Lemur934836a2019-09-09 20:16:54 +00005451 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005452 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005453 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005454
tandrii221ab252016-10-06 08:12:04 -07005455 patchset = options.patchset
5456 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005457 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005458 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005459 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005460 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005461 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005462 cl.GetIssue())
5463
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005464 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005465 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005466 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005467 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005468 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005469 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005470 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005471 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005472 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005473 return 0
5474
5475
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005476@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005477@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005478def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005479 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005480 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005481 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005482 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005483
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005484 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005485 if args:
5486 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005487 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005488 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005489 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005490 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005491
5492 # Clear configured merge-base, if there is one.
5493 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005494 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005495 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005496 return 0
5497
5498
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005499@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005500def CMDweb(parser, args):
5501 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005502 parser.add_option('-p',
5503 '--print-only',
5504 action='store_true',
5505 dest='print_only',
5506 help='Only print the Gerrit URL, don\'t open it in the '
5507 'browser.')
5508 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005509 if args:
5510 parser.error('Unrecognized args: %s' % ' '.join(args))
5511
5512 issue_url = Changelist().GetIssueURL()
5513 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005514 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005515 return 1
5516
Orr Bernstein0b960582022-12-22 20:16:18 +00005517 if options.print_only:
5518 print(issue_url)
5519 return 0
5520
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005521 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005522 # allows us to hide the "Created new window in existing browser session."
5523 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005524 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005525 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005526 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005527 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005528 os.open(os.devnull, os.O_RDWR)
5529 try:
5530 webbrowser.open(issue_url)
5531 finally:
5532 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005533 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005534 return 0
5535
5536
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005537@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005538def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005539 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005540 parser.add_option('-d', '--dry-run', action='store_true',
5541 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005542 parser.add_option(
5543 '-q',
5544 '--quick-run',
5545 action='store_true',
5546 help='trigger in quick run mode '
5547 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5548 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005549 parser.add_option('-c', '--clear', action='store_true',
5550 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005551 parser.add_option(
5552 '-i', '--issue', type=int,
5553 help='Operate on this issue instead of the current branch\'s implicit '
5554 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005555 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005556 if args:
5557 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005558 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5559 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005560
Edward Lemur934836a2019-09-09 20:16:54 +00005561 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005562 if not cl.GetIssue():
5563 parser.error('Must upload the issue first.')
5564
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005565 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005566 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005567 elif options.quick_run:
5568 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005569 elif options.dry_run:
5570 state = _CQState.DRY_RUN
5571 else:
5572 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005573 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005574 return 0
5575
5576
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005577@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005578def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005579 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005580 parser.add_option(
5581 '-i', '--issue', type=int,
5582 help='Operate on this issue instead of the current branch\'s implicit '
5583 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005584 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005585 if args:
5586 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005587 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005588 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005589 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005590 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005591 cl.CloseIssue()
5592 return 0
5593
5594
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005595@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005596def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005597 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005598 parser.add_option(
5599 '--stat',
5600 action='store_true',
5601 dest='stat',
5602 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005603 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005604 if args:
5605 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005606
Edward Lemur934836a2019-09-09 20:16:54 +00005607 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005608 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005609 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005610 if not issue:
5611 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005612
Gavin Makbe2e9262022-11-08 23:41:55 +00005613 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005614 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005615 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005616 if not base:
5617 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5618 revision_info = detail['revisions'][detail['current_revision']]
5619 fetch_info = revision_info['fetch']['http']
5620 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5621 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005622
Aaron Gablea718c3e2017-08-28 17:47:28 -07005623 cmd = ['git', 'diff']
5624 if options.stat:
5625 cmd.append('--stat')
5626 cmd.append(base)
5627 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005628
5629 return 0
5630
5631
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005632@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005633def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005634 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005635 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005636 '--ignore-current',
5637 action='store_true',
5638 help='Ignore the CL\'s current reviewers and start from scratch.')
5639 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005640 '--ignore-self',
5641 action='store_true',
5642 help='Do not consider CL\'s author as an owners.')
5643 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005644 '--no-color',
5645 action='store_true',
5646 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005647 parser.add_option(
5648 '--batch',
5649 action='store_true',
5650 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005651 # TODO: Consider moving this to another command, since other
5652 # git-cl owners commands deal with owners for a given CL.
5653 parser.add_option(
5654 '--show-all',
5655 action='store_true',
5656 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005657 options, args = parser.parse_args(args)
5658
Edward Lemur934836a2019-09-09 20:16:54 +00005659 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005660 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005661
Yang Guo6e269a02019-06-26 11:17:02 +00005662 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005663 if len(args) == 0:
5664 print('No files specified for --show-all. Nothing to do.')
5665 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005666 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005667 for path in args:
5668 print('Owners for %s:' % path)
5669 print('\n'.join(
5670 ' - %s' % owner
5671 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005672 return 0
5673
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005674 if args:
5675 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005676 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005677 base_branch = args[0]
5678 else:
5679 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005680 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005681
Edward Lemur2c62b332020-03-12 22:12:33 +00005682 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005683
5684 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005685 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5686 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005687 return 0
5688
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005689 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005690 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005691 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005692 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005693 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005694 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005695 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005696
5697
Aiden Bennerc08566e2018-10-03 17:52:42 +00005698def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005699 """Generates a diff command."""
5700 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005701 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5702
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005703 if allow_prefix:
5704 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5705 # case that diff.noprefix is set in the user's git config.
5706 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5707 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005708 diff_cmd += ['--no-prefix']
5709
5710 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005711
5712 if args:
5713 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005714 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005715 diff_cmd.append(arg)
5716 else:
5717 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005718
5719 return diff_cmd
5720
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005721
Jamie Madill5e96ad12020-01-13 16:08:35 +00005722def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5723 """Runs clang-format-diff and sets a return value if necessary."""
5724
5725 if not clang_diff_files:
5726 return 0
5727
5728 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5729 # formatted. This is used to block during the presubmit.
5730 return_value = 0
5731
5732 # Locate the clang-format binary in the checkout
5733 try:
5734 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5735 except clang_format.NotFoundError as e:
5736 DieWithError(e)
5737
5738 if opts.full or settings.GetFormatFullByDefault():
5739 cmd = [clang_format_tool]
5740 if not opts.dry_run and not opts.diff:
5741 cmd.append('-i')
5742 if opts.dry_run:
5743 for diff_file in clang_diff_files:
5744 with open(diff_file, 'r') as myfile:
5745 code = myfile.read().replace('\r\n', '\n')
5746 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5747 stdout = stdout.replace('\r\n', '\n')
5748 if opts.diff:
5749 sys.stdout.write(stdout)
5750 if code != stdout:
5751 return_value = 2
5752 else:
5753 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5754 if opts.diff:
5755 sys.stdout.write(stdout)
5756 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005757 try:
5758 script = clang_format.FindClangFormatScriptInChromiumTree(
5759 'clang-format-diff.py')
5760 except clang_format.NotFoundError as e:
5761 DieWithError(e)
5762
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005763 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005764 if not opts.dry_run and not opts.diff:
5765 cmd.append('-i')
5766
5767 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005768 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005769
Edward Lesmes89624cd2020-04-06 17:51:56 +00005770 env = os.environ.copy()
5771 env['PATH'] = (
5772 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5773 stdout = RunCommand(
5774 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005775 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005776 if opts.diff:
5777 sys.stdout.write(stdout)
5778 if opts.dry_run and len(stdout) > 0:
5779 return_value = 2
5780
5781 return return_value
5782
5783
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005784def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5785 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5786 presubmit checks have failed (and returns 0 otherwise)."""
5787
5788 if not rust_diff_files:
5789 return 0
5790
5791 # Locate the rustfmt binary.
5792 try:
5793 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5794 except rustfmt.NotFoundError as e:
5795 DieWithError(e)
5796
5797 # TODO(crbug.com/1231317): Support formatting only the changed lines
5798 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5799 # https://github.com/emilio/rustfmt-format-diff
5800 cmd = [rustfmt_tool]
5801 if opts.dry_run:
5802 cmd.append('--check')
5803 cmd += rust_diff_files
5804 rustfmt_exitcode = subprocess2.call(cmd)
5805
5806 if opts.presubmit and rustfmt_exitcode != 0:
5807 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005808
5809 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005810
5811
Olivier Robin0a6b5442022-04-07 07:25:04 +00005812def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5813 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5814 that presubmit checks have failed (and returns 0 otherwise)."""
5815
5816 if not swift_diff_files:
5817 return 0
5818
5819 # Locate the swift-format binary.
5820 try:
5821 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5822 except swift_format.NotFoundError as e:
5823 DieWithError(e)
5824
5825 cmd = [swift_format_tool]
5826 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005827 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005828 else:
5829 cmd += ['format', '-i']
5830 cmd += swift_diff_files
5831 swift_format_exitcode = subprocess2.call(cmd)
5832
5833 if opts.presubmit and swift_format_exitcode != 0:
5834 return 2
5835
5836 return 0
5837
5838
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005839def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005840 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005841 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005842
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005843
enne@chromium.org555cfe42014-01-29 18:21:39 +00005844@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005845@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005846def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005847 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005848 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005849 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005850 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005851 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005852 parser.add_option('--full', action='store_true',
5853 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005854 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005855 parser.add_option('--dry-run', action='store_true',
5856 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005857 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005858 '--no-clang-format',
5859 dest='clang_format',
5860 action='store_false',
5861 default=True,
5862 help='Disables formatting of various file types using clang-format.')
5863 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005864 '--python',
5865 action='store_true',
5866 default=None,
5867 help='Enables python formatting on all python files.')
5868 parser.add_option(
5869 '--no-python',
5870 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005871 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005872 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005873 'If neither --python or --no-python are set, python files that have a '
5874 '.style.yapf file in an ancestor directory will be formatted. '
5875 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005876 parser.add_option(
5877 '--js',
5878 action='store_true',
5879 help='Format javascript code with clang-format. '
5880 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005881 parser.add_option('--diff', action='store_true',
5882 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005883 parser.add_option('--presubmit', action='store_true',
5884 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005885
5886 parser.add_option('--rust-fmt',
5887 dest='use_rust_fmt',
5888 action='store_true',
5889 default=rustfmt.IsRustfmtSupported(),
5890 help='Enables formatting of Rust file types using rustfmt.')
5891 parser.add_option(
5892 '--no-rust-fmt',
5893 dest='use_rust_fmt',
5894 action='store_false',
5895 help='Disables formatting of Rust file types using rustfmt.')
5896
Olivier Robin0a6b5442022-04-07 07:25:04 +00005897 parser.add_option(
5898 '--swift-format',
5899 dest='use_swift_format',
5900 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005901 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005902 help='Enables formatting of Swift file types using swift-format '
5903 '(macOS host only).')
5904 parser.add_option(
5905 '--no-swift-format',
5906 dest='use_swift_format',
5907 action='store_false',
5908 help='Disables formatting of Swift file types using swift-format.')
5909
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005910 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005911
Garrett Beaty91a6f332020-01-06 16:57:24 +00005912 if opts.python is not None and opts.no_python:
5913 raise parser.error('Cannot set both --python and --no-python')
5914 if opts.no_python:
5915 opts.python = False
5916
Daniel Chengc55eecf2016-12-30 03:11:02 -08005917 # Normalize any remaining args against the current path, so paths relative to
5918 # the current directory are still resolved as expected.
5919 args = [os.path.join(os.getcwd(), arg) for arg in args]
5920
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005921 # git diff generates paths against the root of the repository. Change
5922 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005923 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005924 if rel_base_path:
5925 os.chdir(rel_base_path)
5926
digit@chromium.org29e47272013-05-17 17:01:46 +00005927 # Grab the merge-base commit, i.e. the upstream commit of the current
5928 # branch when it was created or the last time it was rebased. This is
5929 # to cover the case where the user may have called "git fetch origin",
5930 # moving the origin branch to a newer commit, but hasn't rebased yet.
5931 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005932 upstream_branch = opts.upstream
5933 if not upstream_branch:
5934 cl = Changelist()
5935 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005936 if upstream_branch:
5937 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5938 upstream_commit = upstream_commit.strip()
5939
5940 if not upstream_commit:
5941 DieWithError('Could not find base commit for this branch. '
5942 'Are you in detached state?')
5943
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005944 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5945 diff_output = RunGit(changed_files_cmd)
5946 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005947 # Filter out files deleted by this CL
5948 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005949
Andreas Haas417d89c2020-02-06 10:24:27 +00005950 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005951 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005952
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005953 clang_diff_files = []
5954 if opts.clang_format:
5955 clang_diff_files = [
5956 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5957 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005958 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005959 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005960 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005961 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005962
Edward Lesmes50da7702020-03-30 19:23:43 +00005963 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005964
Jamie Madill5e96ad12020-01-13 16:08:35 +00005965 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5966 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005967
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005968 if opts.use_rust_fmt:
5969 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5970 upstream_commit)
5971 if rust_fmt_return_value == 2:
5972 return_value = 2
5973
Olivier Robin0a6b5442022-04-07 07:25:04 +00005974 if opts.use_swift_format:
5975 if sys.platform != 'darwin':
5976 DieWithError('swift-format is only supported on macOS.')
5977 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5978 upstream_commit)
5979 if swift_format_return_value == 2:
5980 return_value = 2
5981
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005982 # Similar code to above, but using yapf on .py files rather than clang-format
5983 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005984 py_explicitly_disabled = opts.python is not None and not opts.python
5985 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005986 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5987 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005988
Aiden Bennerc08566e2018-10-03 17:52:42 +00005989 # Used for caching.
5990 yapf_configs = {}
5991 for f in python_diff_files:
5992 # Find the yapf style config for the current file, defaults to depot
5993 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005994 _FindYapfConfigFile(f, yapf_configs, top_dir)
5995
5996 # Turn on python formatting by default if a yapf config is specified.
5997 # This breaks in the case of this repo though since the specified
5998 # style file is also the global default.
5999 if opts.python is None:
6000 filtered_py_files = []
6001 for f in python_diff_files:
6002 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6003 filtered_py_files.append(f)
6004 else:
6005 filtered_py_files = python_diff_files
6006
6007 # Note: yapf still seems to fix indentation of the entire file
6008 # even if line ranges are specified.
6009 # See https://github.com/google/yapf/issues/499
6010 if not opts.full and filtered_py_files:
6011 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6012
Brian Sheedyb4307d52019-12-02 19:18:17 +00006013 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6014 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6015 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006016
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006017 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006018 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6019 # Default to pep8 if not .style.yapf is found.
6020 if not yapf_style:
6021 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006022
Peter Wend9399922020-06-17 17:33:49 +00006023 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006024 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006025 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006026 else:
6027 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006028
6029 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006030
6031 has_formattable_lines = False
6032 if not opts.full:
6033 # Only run yapf over changed line ranges.
6034 for diff_start, diff_len in py_line_diffs[f]:
6035 diff_end = diff_start + diff_len - 1
6036 # Yapf errors out if diff_end < diff_start but this
6037 # is a valid line range diff for a removal.
6038 if diff_end >= diff_start:
6039 has_formattable_lines = True
6040 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6041 # If all line diffs were removals we have nothing to format.
6042 if not has_formattable_lines:
6043 continue
6044
6045 if opts.diff or opts.dry_run:
6046 cmd += ['--diff']
6047 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006048 stdout = RunCommand(cmd,
6049 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006050 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006051 cwd=top_dir,
6052 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006053 if opts.diff:
6054 sys.stdout.write(stdout)
6055 elif len(stdout) > 0:
6056 return_value = 2
6057 else:
6058 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006059 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006060
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006061 # Format GN build files. Always run on full build files for canonical form.
6062 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006063 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006064 if opts.dry_run or opts.diff:
6065 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006066 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006067 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006068 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006069 cwd=top_dir)
6070 if opts.dry_run and gn_ret == 2:
6071 return_value = 2 # Not formatted.
6072 elif opts.diff and gn_ret == 2:
6073 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006074 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006075 elif gn_ret != 0:
6076 # For non-dry run cases (and non-2 return values for dry-run), a
6077 # nonzero error code indicates a failure, probably because the file
6078 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006079 DieWithError('gn format failed on ' + gn_diff_file +
6080 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006081
Ilya Shermane081cbe2017-08-15 17:51:04 -07006082 # Skip the metrics formatting from the global presubmit hook. These files have
6083 # a separate presubmit hook that issues an error if the files need formatting,
6084 # whereas the top-level presubmit script merely issues a warning. Formatting
6085 # these files is somewhat slow, so it's important not to duplicate the work.
6086 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006087 for diff_xml in GetDiffXMLs(diff_files):
6088 xml_dir = GetMetricsDir(diff_xml)
6089 if not xml_dir:
6090 continue
6091
Ilya Shermane081cbe2017-08-15 17:51:04 -07006092 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006093 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006094 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006095
6096 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6097 # command as histograms/pretty_print.py now needs a relative path argument
6098 # after splitting the histograms into multiple directories.
6099 # For example, in tools/metrics/ukm, pretty-print could be run using:
6100 # $ python pretty_print.py
6101 # But in tools/metrics/histogrmas, pretty-print should be run with an
6102 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006103 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006104 # $ python pretty_print.py enums.xml
6105
Weilun Shib92c4b72020-08-27 17:45:11 +00006106 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006107 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006108 cmd.append(diff_xml)
6109
Ilya Shermane081cbe2017-08-15 17:51:04 -07006110 if opts.dry_run or opts.diff:
6111 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006112
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006113 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6114 # `shell` param and instead replace `'vpython'` with
6115 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006116 stdout = RunCommand(cmd,
6117 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006118 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006119 if opts.diff:
6120 sys.stdout.write(stdout)
6121 if opts.dry_run and stdout:
6122 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006123
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006124 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006125
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006126
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006127def GetDiffXMLs(diff_files):
6128 return [
6129 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6130 ]
6131
6132
6133def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006134 metrics_xml_dirs = [
6135 os.path.join('tools', 'metrics', 'actions'),
6136 os.path.join('tools', 'metrics', 'histograms'),
6137 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006138 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006139 os.path.join('tools', 'metrics', 'ukm'),
6140 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006141 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006142 if diff_xml.startswith(xml_dir):
6143 return xml_dir
6144 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006145
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006146
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006147@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006148@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006149def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006150 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006151 _, args = parser.parse_args(args)
6152
6153 if len(args) != 1:
6154 parser.print_help()
6155 return 1
6156
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006157 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006158 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006159 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006160
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006161 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006162
Edward Lemur52969c92020-02-06 18:15:28 +00006163 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006164 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006165 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006166
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006167 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006168 for key, issue in [x.split() for x in output.splitlines()]:
6169 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006170 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006171
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006172 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006173 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006174 return 1
6175 if len(branches) == 1:
6176 RunGit(['checkout', branches[0]])
6177 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006178 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006179 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006180 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006181 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006182 try:
6183 RunGit(['checkout', branches[int(which)]])
6184 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006185 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006186 return 1
6187
6188 return 0
6189
6190
maruel@chromium.org29404b52014-09-08 22:58:00 +00006191def CMDlol(parser, args):
6192 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006193 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006194 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6195 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6196 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006197 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006198 return 0
6199
6200
Josip Sokcevic0399e172022-03-21 23:11:51 +00006201def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006202 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006203 print(utils.depot_tools_version())
6204
6205
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006206class OptionParser(optparse.OptionParser):
6207 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006208
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006209 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006210 optparse.OptionParser.__init__(
6211 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006212 self.add_option(
6213 '-v', '--verbose', action='count', default=0,
6214 help='Use 2 times for more debugging info')
6215
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006216 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006217 try:
6218 return self._parse_args(args)
6219 finally:
6220 # Regardless of success or failure of args parsing, we want to report
6221 # metrics, but only after logging has been initialized (if parsing
6222 # succeeded).
6223 global settings
6224 settings = Settings()
6225
Edward Lesmes9c349062021-05-06 20:02:39 +00006226 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006227 try:
6228 # GetViewVCUrl ultimately calls logging method.
6229 project_url = settings.GetViewVCUrl().strip('/+')
6230 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6231 metrics.collector.add('project_urls', [project_url])
6232 except subprocess2.CalledProcessError:
6233 # Occurs when command is not executed in a git repository
6234 # We should not fail here. If the command needs to be executed
6235 # in a repo, it will be raised later.
6236 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006237
6238 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006239 # Create an optparse.Values object that will store only the actual passed
6240 # options, without the defaults.
6241 actual_options = optparse.Values()
6242 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6243 # Create an optparse.Values object with the default options.
6244 options = optparse.Values(self.get_default_values().__dict__)
6245 # Update it with the options passed by the user.
6246 options._update_careful(actual_options.__dict__)
6247 # Store the options passed by the user in an _actual_options attribute.
6248 # We store only the keys, and not the values, since the values can contain
6249 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006250 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006251
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006252 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006253 logging.basicConfig(
6254 level=levels[min(options.verbose, len(levels) - 1)],
6255 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6256 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006257
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006258 return options, args
6259
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006260
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006261def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006262 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006263 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006264 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006265 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006266
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006267 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006268 dispatcher = subcommand.CommandDispatcher(__name__)
6269 try:
6270 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006271 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006272 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006273 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006274 if e.code != 500:
6275 raise
6276 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006277 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006278 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006279 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006280
6281
6282if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006283 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6284 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006285 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006286 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006287 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006288 sys.exit(main(sys.argv[1:]))