blob: 509b1cfbe32230bd35330195890c6012008c0efc [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/'
Joanna Wangd3cbd402023-04-10 16:51:57 +0000174 'chromium.googlesource.com/chromium/src'
Joanna Wang5051ffe2023-03-01 22:24:07 +0000175]
176
177
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000178class GitPushError(Exception):
179 pass
180
181
Christopher Lamf732cd52017-01-24 12:40:11 +1100182def DieWithError(message, change_desc=None):
183 if change_desc:
184 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000185 print('\n ** Content of CL description **\n' +
186 '='*72 + '\n' +
187 change_desc.description + '\n' +
188 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100189
vapiera7fbd5a2016-06-16 09:17:49 -0700190 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000191 sys.exit(1)
192
193
Christopher Lamf732cd52017-01-24 12:40:11 +1100194def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000195 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000196 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000197 with open(backup_path, 'wb') as backup_file:
198 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100199
200
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000201def GetNoGitPagerEnv():
202 env = os.environ.copy()
203 # 'cat' is a magical git string that disables pagers on all platforms.
204 env['GIT_PAGER'] = 'cat'
205 return env
206
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000207
bsep@chromium.org627d9002016-04-29 00:00:52 +0000208def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000209 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000210 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
211 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000212 except subprocess2.CalledProcessError as e:
213 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000214 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000215 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
216 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000217 out = e.stdout.decode('utf-8', 'replace')
218 if e.stderr:
219 out += e.stderr.decode('utf-8', 'replace')
220 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000221
222
223def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000224 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000225 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000226
227
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000228def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000229 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700230 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000231 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700232 else:
233 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000234 try:
tandrii5d48c322016-08-18 16:19:37 -0700235 (out, _), code = subprocess2.communicate(['git'] + args,
236 env=GetNoGitPagerEnv(),
237 stdout=subprocess2.PIPE,
238 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000239 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700240 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900241 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000242 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000243
244
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000245def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000246 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000247 return RunGitWithCode(args, suppress_stderr=True)[1]
248
249
tandrii2a16b952016-10-19 07:09:44 -0700250def time_sleep(seconds):
251 # Use this so that it can be mocked in tests without interfering with python
252 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700253 return time.sleep(seconds)
254
255
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000256def time_time():
257 # Use this so that it can be mocked in tests without interfering with python
258 # system machinery.
259 return time.time()
260
261
Edward Lemur1b52d872019-05-09 21:12:12 +0000262def datetime_now():
263 # Use this so that it can be mocked in tests without interfering with python
264 # system machinery.
265 return datetime.datetime.now()
266
267
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100268def confirm_or_exit(prefix='', action='confirm'):
269 """Asks user to press enter to continue or press Ctrl+C to abort."""
270 if not prefix or prefix.endswith('\n'):
271 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100272 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100273 mid = ' Press'
274 elif prefix.endswith(' '):
275 mid = 'press'
276 else:
277 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000278 gclient_utils.AskForData(
279 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100280
281
282def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000283 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000284 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100285 while True:
286 if 'yes'.startswith(result):
287 return True
288 if 'no'.startswith(result):
289 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000290 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100291
292
machenbach@chromium.org45453142015-09-15 08:45:22 +0000293def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000294 prop_list = getattr(options, 'properties', [])
295 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000296 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000297 try:
298 properties[key] = json.loads(val)
299 except ValueError:
300 pass # If a value couldn't be evaluated, treat it as a string.
301 return properties
302
303
Edward Lemur4c707a22019-09-24 21:13:43 +0000304def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000305 """Calls a buildbucket v2 method and returns the parsed json response."""
306 headers = {
307 'Accept': 'application/json',
308 'Content-Type': 'application/json',
309 }
310 request = json.dumps(request)
311 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
312
313 logging.info('POST %s with %s' % (url, request))
314
315 attempts = 1
316 time_to_sleep = 1
317 while True:
318 response, content = http.request(url, 'POST', body=request, headers=headers)
319 if response.status == 200:
320 return json.loads(content[4:])
321 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
322 msg = '%s error when calling POST %s with %s: %s' % (
323 response.status, url, request, content)
324 raise BuildbucketResponseException(msg)
325 logging.debug(
326 '%s error when calling POST %s with %s. '
327 'Sleeping for %d seconds and retrying...' % (
328 response.status, url, request, time_to_sleep))
329 time.sleep(time_to_sleep)
330 time_to_sleep *= 2
331 attempts += 1
332
333 assert False, 'unreachable'
334
335
Edward Lemur6215c792019-10-03 21:59:05 +0000336def _parse_bucket(raw_bucket):
337 legacy = True
338 project = bucket = None
339 if '/' in raw_bucket:
340 legacy = False
341 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000342 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000343 elif raw_bucket.startswith('luci.'):
344 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000345 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000346 elif '.' in raw_bucket:
347 project = raw_bucket.split('.')[0]
348 bucket = raw_bucket
349 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000350 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000351 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
352 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000353
354
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000355def _canonical_git_googlesource_host(host):
356 """Normalizes Gerrit hosts (with '-review') to Git host."""
357 assert host.endswith(_GOOGLESOURCE)
358 # Prefix doesn't include '.' at the end.
359 prefix = host[:-(1 + len(_GOOGLESOURCE))]
360 if prefix.endswith('-review'):
361 prefix = prefix[:-len('-review')]
362 return prefix + '.' + _GOOGLESOURCE
363
364
365def _canonical_gerrit_googlesource_host(host):
366 git_host = _canonical_git_googlesource_host(host)
367 prefix = git_host.split('.', 1)[0]
368 return prefix + '-review.' + _GOOGLESOURCE
369
370
371def _get_counterpart_host(host):
372 assert host.endswith(_GOOGLESOURCE)
373 git = _canonical_git_googlesource_host(host)
374 gerrit = _canonical_gerrit_googlesource_host(git)
375 return git if gerrit == host else gerrit
376
377
Quinten Yearsley777660f2020-03-04 23:37:06 +0000378def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000379 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700380
381 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000382 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000383 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 options: Command-line options.
385 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000386 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000387 for project, bucket, builder in jobs:
388 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000389 print('To see results here, run: git cl try-results')
390 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700391
Quinten Yearsley777660f2020-03-04 23:37:06 +0000392 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000393 if not requests:
394 return
395
Edward Lemur5b929a42019-10-21 17:57:39 +0000396 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000397 http.force_exception_to_status_code = True
398
399 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000400 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
401 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000402
403 errors = [
404 ' ' + response['error']['message']
405 for response in batch_response.get('responses', [])
406 if 'error' in response
407 ]
408 if errors:
409 raise BuildbucketResponseException(
410 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
411
412
Quinten Yearsley777660f2020-03-04 23:37:06 +0000413def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000414 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000415 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 shared_properties = {
417 'category': options.ensure_value('category', 'git_cl_try')
418 }
419 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 shared_properties['clobber'] = True
421 shared_properties.update(_get_properties_from_options(options) or {})
422
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000423 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000424 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000425 shared_tags.append({'key': 'retry_failed',
426 'value': '1'})
427
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000428 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000429 for (project, bucket, builder) in jobs:
430 properties = shared_properties.copy()
431 if 'presubmit' in builder.lower():
432 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433
Edward Lemur45768512020-03-02 19:03:14 +0000434 requests.append({
435 'scheduleBuild': {
436 'requestId': str(uuid.uuid4()),
437 'builder': {
438 'project': getattr(options, 'project', None) or project,
439 'bucket': bucket,
440 'builder': builder,
441 },
442 'gerritChanges': gerrit_changes,
443 'properties': properties,
444 'tags': [
445 {'key': 'builder', 'value': builder},
446 ] + shared_tags,
447 }
448 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000450 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000451 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000452 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000453 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000454 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000455 'id': options.revision,
456 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000457 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000458
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000459 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000460
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000461
Quinten Yearsley777660f2020-03-04 23:37:06 +0000462def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000463 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000464
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000465 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000466 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000467 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000468 request = {
469 'predicate': {
470 'gerritChanges': [changelist.GetGerritChange(patchset)],
471 },
472 'fields': ','.join('builds.*.' + field for field in fields),
473 }
tandrii221ab252016-10-06 08:12:04 -0700474
Edward Lemur5b929a42019-10-21 17:57:39 +0000475 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000476 if authenticator.has_cached_credentials():
477 http = authenticator.authorize(httplib2.Http())
478 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700479 print('Warning: Some results might be missing because %s' %
480 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000481 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000482 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000483 http.force_exception_to_status_code = True
484
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000485 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
486 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000487
Edward Lemur45768512020-03-02 19:03:14 +0000488
Edward Lemur5b929a42019-10-21 17:57:39 +0000489def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 """Fetches builds from the latest patchset that has builds (within
491 the last few patchsets).
492
493 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000494 changelist (Changelist): The CL to fetch builds for
495 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000496 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
497 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000498 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000499 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
500 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000501 """
502 assert buildbucket_host
503 assert changelist.GetIssue(), 'CL must be uploaded first'
504 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000505 if latest_patchset is None:
506 assert changelist.GetMostRecentPatchset()
507 ps = changelist.GetMostRecentPatchset()
508 else:
509 assert latest_patchset > 0, latest_patchset
510 ps = latest_patchset
511
Quinten Yearsley983111f2019-09-26 17:18:48 +0000512 min_ps = max(1, ps - 5)
513 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000514 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515 if len(builds):
516 return builds, ps
517 ps -= 1
518 return [], 0
519
520
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000521def _filter_failed_for_retry(all_builds):
522 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000523
524 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000525 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000526 i.e. a list of buildbucket.v2.Builds which includes status and builder
527 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000528
529 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000530 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000531 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000532 """
Edward Lemur45768512020-03-02 19:03:14 +0000533 grouped = {}
534 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000535 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000536 key = (builder['project'], builder['bucket'], builder['builder'])
537 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000538
Edward Lemur45768512020-03-02 19:03:14 +0000539 jobs = []
540 for (project, bucket, builder), builds in grouped.items():
541 if 'triggered' in builder:
542 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
543 'from a parent. Please schedule a manual job for the parent '
544 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000545 continue
546 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
547 # Don't retry if any are running.
548 continue
Edward Lemur45768512020-03-02 19:03:14 +0000549 # If builder had several builds, retry only if the last one failed.
550 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
551 # build, but in case of retrying failed jobs retrying a flaky one makes
552 # sense.
553 builds = sorted(builds, key=lambda b: b['createTime'])
554 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
555 continue
556 # Don't retry experimental build previously triggered by CQ.
557 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
558 for t in builds[-1]['tags']):
559 continue
560 jobs.append((project, bucket, builder))
561
562 # Sort the jobs to make testing easier.
563 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000564
565
Quinten Yearsley777660f2020-03-04 23:37:06 +0000566def _print_tryjobs(options, builds):
567 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000569 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570 return
571
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000572 longest_builder = max(len(b['builder']['builder']) for b in builds)
573 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000574 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000575 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
576 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 builds_by_status = {}
579 for b in builds:
580 builds_by_status.setdefault(b['status'], []).append({
581 'id': b['id'],
582 'name': name_fmt.format(
583 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
584 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000586 sort_key = lambda b: (b['name'], b['id'])
587
588 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000589 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000590 if not builds:
591 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000593 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000594 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000595 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596 else:
597 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
598
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000599 print(colorize(title))
600 for b in sorted(builds, key=sort_key):
601 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602
603 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000604 print_builds(
605 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
606 print_builds(
607 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
608 color=Fore.MAGENTA)
609 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
610 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
611 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000612 print_builds('Started:', builds_by_status.pop('STARTED', []),
613 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000614 print_builds(
615 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000617 print_builds(
618 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000619 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000620
621
Aiden Bennerc08566e2018-10-03 17:52:42 +0000622def _ComputeDiffLineRanges(files, upstream_commit):
623 """Gets the changed line ranges for each file since upstream_commit.
624
625 Parses a git diff on provided files and returns a dict that maps a file name
626 to an ordered list of range tuples in the form (start_line, count).
627 Ranges are in the same format as a git diff.
628 """
629 # If files is empty then diff_output will be a full diff.
630 if len(files) == 0:
631 return {}
632
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000633 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000634 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000635 diff_output = RunGit(diff_cmd)
636
637 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
638 # 2 capture groups
639 # 0 == fname of diff file
640 # 1 == 'diff_start,diff_count' or 'diff_start'
641 # will match each of
642 # diff --git a/foo.foo b/foo.py
643 # @@ -12,2 +14,3 @@
644 # @@ -12,2 +17 @@
645 # running re.findall on the above string with pattern will give
646 # [('foo.py', ''), ('', '14,3'), ('', '17')]
647
648 curr_file = None
649 line_diffs = {}
650 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
651 if match[0] != '':
652 # Will match the second filename in diff --git a/a.py b/b.py.
653 curr_file = match[0]
654 line_diffs[curr_file] = []
655 else:
656 # Matches +14,3
657 if ',' in match[1]:
658 diff_start, diff_count = match[1].split(',')
659 else:
660 # Single line changes are of the form +12 instead of +12,1.
661 diff_start = match[1]
662 diff_count = 1
663
664 diff_start = int(diff_start)
665 diff_count = int(diff_count)
666
667 # If diff_count == 0 this is a removal we can ignore.
668 line_diffs[curr_file].append((diff_start, diff_count))
669
670 return line_diffs
671
672
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000673def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000674 """Checks if a yapf file is in any parent directory of fpath until top_dir.
675
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000676 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000677 is found returns None. Uses yapf_config_cache as a cache for previously found
678 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000679 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000680 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000681 # Return result if we've already computed it.
682 if fpath in yapf_config_cache:
683 return yapf_config_cache[fpath]
684
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000685 parent_dir = os.path.dirname(fpath)
686 if os.path.isfile(fpath):
687 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000688 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000689 # Otherwise fpath is a directory
690 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
691 if os.path.isfile(yapf_file):
692 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000693 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000694 # If we're at the top level directory, or if we're at root
695 # there is no provided style.
696 ret = None
697 else:
698 # Otherwise recurse on the current directory.
699 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000700 yapf_config_cache[fpath] = ret
701 return ret
702
703
Brian Sheedyb4307d52019-12-02 19:18:17 +0000704def _GetYapfIgnorePatterns(top_dir):
705 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000706
707 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
708 but this functionality appears to break when explicitly passing files to
709 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000710 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711 the .yapfignore file should be in the directory that yapf is invoked from,
712 which we assume to be the top level directory in this case.
713
714 Args:
715 top_dir: The top level directory for the repository being formatted.
716
717 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000718 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000719 """
720 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000721 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000722 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000724
Anthony Politoc64e3902021-04-30 21:55:25 +0000725 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
726 stripped_line = line.strip()
727 # Comments and blank lines should be ignored.
728 if stripped_line.startswith('#') or stripped_line == '':
729 continue
730 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000731 return ignore_patterns
732
733
734def _FilterYapfIgnoredFiles(filepaths, patterns):
735 """Filters out any filepaths that match any of the given patterns.
736
737 Args:
738 filepaths: An iterable of strings containing filepaths to filter.
739 patterns: An iterable of strings containing fnmatch patterns to filter on.
740
741 Returns:
742 A list of strings containing all the elements of |filepaths| that did not
743 match any of the patterns in |patterns|.
744 """
745 # Not inlined so that tests can use the same implementation.
746 return [f for f in filepaths
747 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000748
749
Aaron Gable13101a62018-02-09 13:20:41 -0800750def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 """Prints statistics about the change to the user."""
752 # --no-ext-diff is broken in some versions of Git, so try to work around
753 # this by overriding the environment (but there is still a problem if the
754 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000755 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000756 if 'GIT_EXTERNAL_DIFF' in env:
757 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000759 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800760 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000761 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000762
763
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000764class BuildbucketResponseException(Exception):
765 pass
766
767
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768class Settings(object):
769 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000770 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000771 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000772 self.tree_status_url = None
773 self.viewvc_url = None
774 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000775 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000776 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000777 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000778 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000779 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000780 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000781
Edward Lemur26964072020-02-19 19:18:51 +0000782 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000783 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000784 if self.updated:
785 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000786
Edward Lemur26964072020-02-19 19:18:51 +0000787 # The only value that actually changes the behavior is
788 # autoupdate = "false". Everything else means "true".
789 autoupdate = (
790 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
791
792 cr_settings_file = FindCodereviewSettingsFile()
793 if autoupdate != 'false' and cr_settings_file:
794 LoadCodereviewSettingsFromFile(cr_settings_file)
795 cr_settings_file.close()
796
797 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000799 @staticmethod
800 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000801 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000802
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000803 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000804 if self.root is None:
805 self.root = os.path.abspath(self.GetRelativeRoot())
806 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 def GetTreeStatusUrl(self, error_ok=False):
809 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000810 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
811 if self.tree_status_url is None and not error_ok:
812 DieWithError(
813 'You must configure your tree status URL by running '
814 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815 return self.tree_status_url
816
817 def GetViewVCUrl(self):
818 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000819 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000820 return self.viewvc_url
821
rmistry@google.com90752582014-01-14 21:04:50 +0000822 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000823 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000824
rmistry@google.com5626a922015-02-26 14:03:30 +0000825 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000826 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000827 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000828 return run_post_upload_hook == "True"
829
Joanna Wangc8f23e22023-01-19 21:18:10 +0000830 def GetDefaultCCList(self):
831 return self._GetConfig('rietveld.cc')
832
Dirk Pranke6f0df682021-06-25 00:42:33 +0000833 def GetUsePython3(self):
834 return self._GetConfig('rietveld.use-python3')
835
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000837 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000838 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000839 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
840 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000841 # Default is squash now (http://crbug.com/611892#c23).
842 self.squash_gerrit_uploads = self._GetConfig(
843 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000844 return self.squash_gerrit_uploads
845
Edward Lesmes4de54132020-05-05 19:41:33 +0000846 def GetSquashGerritUploadsOverride(self):
847 """Return True or False if codereview.settings should be overridden.
848
849 Returns None if no override has been defined.
850 """
851 # See also http://crbug.com/611892#c23
852 result = self._GetConfig('gerrit.override-squash-uploads').lower()
853 if result == 'true':
854 return True
855 if result == 'false':
856 return False
857 return None
858
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000859 def GetIsGerrit(self):
860 """Return True if gerrit.host is set."""
861 if self.is_gerrit is None:
862 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
863 return self.is_gerrit
864
tandrii@chromium.org28253532016-04-14 13:46:56 +0000865 def GetGerritSkipEnsureAuthenticated(self):
866 """Return True if EnsureAuthenticated should not be done for Gerrit
867 uploads."""
868 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000869 self.gerrit_skip_ensure_authenticated = self._GetConfig(
870 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000871 return self.gerrit_skip_ensure_authenticated
872
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000873 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000874 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000876 # Git requires single quotes for paths with spaces. We need to replace
877 # them with double quotes for Windows to treat such paths as a single
878 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000879 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000880 return self.git_editor or None
881
thestig@chromium.org44202a22014-03-11 19:22:18 +0000882 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000883 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000884
885 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000886 return self._GetConfig(
887 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000888
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000889 def GetFormatFullByDefault(self):
890 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000891 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000892 result = (
893 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
894 error_ok=True).strip())
895 self.format_full_by_default = (result == 'true')
896 return self.format_full_by_default
897
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000898 def IsStatusCommitOrderByDate(self):
899 if self.is_status_commit_order_by_date is None:
900 result = (RunGit(['config', '--bool', 'cl.date-order'],
901 error_ok=True).strip())
902 self.is_status_commit_order_by_date = (result == 'true')
903 return self.is_status_commit_order_by_date
904
Edward Lemur26964072020-02-19 19:18:51 +0000905 def _GetConfig(self, key, default=''):
906 self._LazyUpdateIfNeeded()
907 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000908
909
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000910class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000911 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000912 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000913 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000914 DRY_RUN = 'dry_run'
915 COMMIT = 'commit'
916
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000917 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000918
919
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000921 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000922 self.issue = issue
923 self.patchset = patchset
924 self.hostname = hostname
925
926 @property
927 def valid(self):
928 return self.issue is not None
929
930
Edward Lemurf38bc172019-09-03 21:02:13 +0000931def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
933 fail_result = _ParsedIssueNumberArgument()
934
Edward Lemur678a6842019-10-03 22:25:05 +0000935 if isinstance(arg, int):
936 return _ParsedIssueNumberArgument(issue=arg)
937 if not isinstance(arg, basestring):
938 return fail_result
939
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000940 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000941 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000944 if not url.startswith('http'):
945 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000946 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
947 if url.startswith(short_url):
948 url = gerrit_url + url[len(short_url):]
949 break
950
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000951 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000952 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000953 except ValueError:
954 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200955
Alex Turner30ae6372022-01-04 02:32:52 +0000956 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
957 # URL.
958 if not arg.startswith('http') and '.' not in parsed_url.netloc:
959 return fail_result
960
Edward Lemur678a6842019-10-03 22:25:05 +0000961 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
962 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
963 # Short urls like https://domain/<issue_number> can be used, but don't allow
964 # specifying the patchset (you'd 404), but we allow that here.
965 if parsed_url.path == '/':
966 part = parsed_url.fragment
967 else:
968 part = parsed_url.path
969
970 match = re.match(
971 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
972 if not match:
973 return fail_result
974
975 issue = int(match.group('issue'))
976 patchset = match.group('patchset')
977 return _ParsedIssueNumberArgument(
978 issue=issue,
979 patchset=int(patchset) if patchset else None,
980 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000981
982
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000983def _create_description_from_log(args):
984 """Pulls out the commit log to use as a base for the CL description."""
985 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000986 if len(args) == 1 and args[0] == None:
987 # Handle the case where None is passed as the branch.
988 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000989 if len(args) == 1 and not args[0].endswith('.'):
990 log_args = [args[0] + '..']
991 elif len(args) == 1 and args[0].endswith('...'):
992 log_args = [args[0][:-1]]
993 elif len(args) == 2:
994 log_args = [args[0] + '..' + args[1]]
995 else:
996 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000997 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000998
999
Aaron Gablea45ee112016-11-22 15:14:38 -08001000class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001001 def __init__(self, issue, url):
1002 self.issue = issue
1003 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001004 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001005
1006 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001007 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001008 self.issue, self.url)
1009
1010
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001011_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001012 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001013 # TODO(tandrii): these two aren't known in Gerrit.
1014 'approval', 'disapproval'])
1015
1016
Joanna Wang6215dd02023-02-07 15:58:03 +00001017# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001018_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001019 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001020 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001021])
1022
1023
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001024class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001025 """Changelist works with one changelist in local branch.
1026
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001027 Notes:
1028 * Not safe for concurrent multi-{thread,process} use.
1029 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001030 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001031 """
1032
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001033 def __init__(self,
1034 branchref=None,
1035 issue=None,
1036 codereview_host=None,
1037 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001038 """Create a new ChangeList instance.
1039
Edward Lemurf38bc172019-09-03 21:02:13 +00001040 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001041 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001043 global settings
1044 if not settings:
1045 # Happens when git_cl.py is used as a utility library.
1046 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001047
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048 self.branchref = branchref
1049 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001050 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001051 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 else:
1053 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001054 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001055 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001056 self.lookedup_issue = False
1057 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001058 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001059 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001060 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001061 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001062 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001063 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001064 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001065
Edward Lemur125d60a2019-09-13 18:25:41 +00001066 # Lazily cached values.
1067 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1068 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001069 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001070 # Map from change number (issue) to its detail cache.
1071 self._detail_cache = {}
1072
1073 if codereview_host is not None:
1074 assert not codereview_host.startswith('https://'), codereview_host
1075 self._gerrit_host = codereview_host
1076 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077
Edward Lesmese1576912021-02-16 21:53:34 +00001078 @property
1079 def owners_client(self):
1080 if self._owners_client is None:
1081 remote, remote_branch = self.GetRemoteBranch()
1082 branch = GetTargetRef(remote, remote_branch, None)
1083 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001084 host=self.GetGerritHost(),
1085 project=self.GetGerritProject(),
1086 branch=branch)
1087 return self._owners_client
1088
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001089 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001090 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001091
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001092 The return value is a string suitable for passing to git cl with the --cc
1093 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001094 """
1095 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001096 base_cc = settings.GetDefaultCCList()
1097 more_cc = ','.join(self.more_cc)
1098 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001099 return self.cc
1100
Daniel Cheng7227d212017-11-17 08:12:37 -08001101 def ExtendCC(self, more_cc):
1102 """Extends the list of users to cc on this CL based on the changed files."""
1103 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001104
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001105 def GetCommitDate(self):
1106 """Returns the commit date as provided in the constructor"""
1107 return self.commit_date
1108
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001110 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001112 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001113 if not branchref:
1114 return None
1115 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001116 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 return self.branch
1118
1119 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001120 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 self.GetBranch() # Poke the lazy loader.
1122 return self.branchref
1123
Edward Lemur85153282020-02-14 22:06:29 +00001124 def _GitGetBranchConfigValue(self, key, default=None):
1125 return scm.GIT.GetBranchConfig(
1126 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001127
Edward Lemur85153282020-02-14 22:06:29 +00001128 def _GitSetBranchConfigValue(self, key, value):
1129 action = 'set %s to %r' % (key, value)
1130 if not value:
1131 action = 'unset %s' % key
1132 assert self.GetBranch(), 'a branch is needed to ' + action
1133 return scm.GIT.SetBranchConfig(
1134 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001135
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001136 @staticmethod
1137 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001138 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001139 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001141 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1142 settings.GetRoot(), branch)
1143 if not remote or not upstream_branch:
1144 DieWithError(
1145 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001146 'Verify this branch is set up to track another \n'
1147 '(via the --track argument to "git checkout -b ..."). \n'
1148 'or pass complete "git diff"-style arguments if supported, like\n'
1149 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150
1151 return remote, upstream_branch
1152
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001153 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001154 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001155 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001156 DieWithError('The upstream for the current branch (%s) does not exist '
1157 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001158 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001159 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001160
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161 def GetUpstreamBranch(self):
1162 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001164 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001165 upstream_branch = upstream_branch.replace('refs/heads/',
1166 'refs/remotes/%s/' % remote)
1167 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1168 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001169 self.upstream_branch = upstream_branch
1170 return self.upstream_branch
1171
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001173 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 remote, branch = None, self.GetBranch()
1175 seen_branches = set()
1176 while branch not in seen_branches:
1177 seen_branches.add(branch)
1178 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001179 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001180 if remote != '.' or branch.startswith('refs/remotes'):
1181 break
1182 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001183 remotes = RunGit(['remote'], error_ok=True).split()
1184 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001185 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001186 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001188 logging.warning('Could not determine which remote this change is '
1189 'associated with, so defaulting to "%s".' %
1190 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001191 else:
Gavin Make6a62332020-12-04 21:57:10 +00001192 logging.warning('Could not determine which remote this change is '
1193 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001194 branch = 'HEAD'
1195 if branch.startswith('refs/remotes'):
1196 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001197 elif branch.startswith('refs/branch-heads/'):
1198 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001199 else:
1200 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001201 return self._remote
1202
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 def GetRemoteUrl(self):
1204 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1205
1206 Returns None if there is no remote.
1207 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001208 is_cached, value = self._cached_remote_url
1209 if is_cached:
1210 return value
1211
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001213 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001214
Edward Lemur298f2cf2019-02-22 21:40:39 +00001215 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001216 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001217 if host:
1218 self._cached_remote_url = (True, url)
1219 return url
1220
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001221 # If it cannot be parsed as an url, assume it is a local directory,
1222 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001223 logging.warning('"%s" doesn\'t appear to point to a git host. '
1224 'Interpreting it as a local directory.', url)
1225 if not os.path.isdir(url):
1226 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001227 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1228 'but it doesn\'t exist.',
1229 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001230 return None
1231
1232 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001233 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001234
Edward Lemur79d4f992019-11-11 23:49:02 +00001235 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001236 if not host:
1237 logging.error(
1238 'Remote "%(remote)s" for branch "%(branch)s" points to '
1239 '"%(cache_path)s", but it is misconfigured.\n'
1240 '"%(cache_path)s" must be a git repo and must have a remote named '
1241 '"%(remote)s" pointing to the git host.', {
1242 'remote': remote,
1243 'cache_path': cache_path,
1244 'branch': self.GetBranch()})
1245 return None
1246
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001247 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001248 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001250 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001251 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001252 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001253 if self.GetBranch():
1254 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001255 if self.issue is not None:
1256 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001257 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 return self.issue
1259
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001260 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001262 issue = self.GetIssue()
1263 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001264 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001265 server = self.GetCodereviewServer()
1266 if short:
1267 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1268 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269
Dirk Pranke6f0df682021-06-25 00:42:33 +00001270 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001271 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001272
Edward Lemur6c6827c2020-02-06 21:15:18 +00001273 def FetchDescription(self, pretty=False):
1274 assert self.GetIssue(), 'issue is required to query Gerrit'
1275
Edward Lemur9aa1a962020-02-25 00:58:38 +00001276 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001277 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1278 current_rev = data['current_revision']
1279 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001280
1281 if not pretty:
1282 return self.description
1283
1284 # Set width to 72 columns + 2 space indent.
1285 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1286 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1287 lines = self.description.splitlines()
1288 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289
1290 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001291 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001292 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001293 if self.GetBranch():
1294 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001295 if self.patchset is not None:
1296 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001297 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 return self.patchset
1299
Edward Lemur9aa1a962020-02-25 00:58:38 +00001300 def GetAuthor(self):
1301 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1302
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001304 """Set this branch's patchset. If patchset=0, clears the patchset."""
1305 assert self.GetBranch()
1306 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001307 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001308 else:
1309 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001310 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001311
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001312 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001313 """Set this branch's issue. If issue isn't given, clears the issue."""
1314 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001316 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001317 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001318 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001319 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001320 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001321 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001322 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001323 else:
tandrii5d48c322016-08-18 16:19:37 -07001324 # Reset all of these just to be clean.
1325 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001326 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001327 ISSUE_CONFIG_KEY,
1328 PATCHSET_CONFIG_KEY,
1329 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001330 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001331 ]
tandrii5d48c322016-08-18 16:19:37 -07001332 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001333 try:
1334 self._GitSetBranchConfigValue(prop, None)
1335 except subprocess2.CalledProcessError:
1336 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001337 msg = RunGit(['log', '-1', '--format=%B']).strip()
1338 if msg and git_footers.get_footer_change_id(msg):
1339 print('WARNING: The change patched into this branch has a Change-Id. '
1340 'Removing it.')
1341 RunGit(['commit', '--amend', '-m',
1342 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001343 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001344 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001345 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001346
Joanna Wangb46232e2023-01-21 01:58:46 +00001347 def GetAffectedFiles(self, upstream, end_commit=None):
1348 # type: (str, Optional[str]) -> Sequence[str]
1349 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001350 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001351 return [
1352 f for _, f in scm.GIT.CaptureStatus(
1353 settings.GetRoot(), upstream, end_commit=end_commit)
1354 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001355 except subprocess2.CalledProcessError:
1356 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001357 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001358 'This branch probably doesn\'t exist anymore. To reset the\n'
1359 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001360 ' git branch --set-upstream-to origin/main %s\n'
1361 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001362 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001363
dsansomee2d6fd92016-09-08 00:10:47 -07001364 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 assert self.GetIssue(), 'issue is required to update description'
1366
1367 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001368 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001369 if not force:
1370 confirm_or_exit(
1371 'The description cannot be modified while the issue has a pending '
1372 'unpublished edit. Either publish the edit in the Gerrit web UI '
1373 'or delete it.\n\n', action='delete the unpublished edit')
1374
1375 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001376 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001377 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001378 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001379 description, notify='NONE')
1380
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001382
Edward Lemur75526302020-02-27 22:31:05 +00001383 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001384 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001385 '--root', settings.GetRoot(),
1386 '--upstream', upstream,
1387 ]
1388
1389 args.extend(['--verbose'] * verbose)
1390
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001391 remote, remote_branch = self.GetRemoteBranch()
1392 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001393 if settings.GetIsGerrit():
1394 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1395 args.extend(['--gerrit_project', self.GetGerritProject()])
1396 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001397
Edward Lemur99df04e2020-03-05 19:39:43 +00001398 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001399 issue = self.GetIssue()
1400 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001401 if author:
1402 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001403 if issue:
1404 args.extend(['--issue', str(issue)])
1405 if patchset:
1406 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001407
Edward Lemur75526302020-02-27 22:31:05 +00001408 return args
1409
Josip Sokcevic017544d2022-03-31 23:47:53 +00001410 def RunHook(self,
1411 committing,
1412 may_prompt,
1413 verbose,
1414 parallel,
1415 upstream,
1416 description,
1417 all_files,
1418 files=None,
1419 resultdb=False,
1420 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001421 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1422 args = self._GetCommonPresubmitArgs(verbose, upstream)
1423 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001424 if may_prompt:
1425 args.append('--may_prompt')
1426 if parallel:
1427 args.append('--parallel')
1428 if all_files:
1429 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001430 if files:
1431 args.extend(files.split(';'))
1432 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001433 if files or all_files:
1434 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001435
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001436 if resultdb and not realm:
1437 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1438 # it is not required to pass the realm flag
1439 print('Note: ResultDB reporting will NOT be performed because --realm'
1440 ' was not specified. To enable ResultDB, please run the command'
1441 ' again with the --realm argument to specify the LUCI realm.')
1442
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001443 py3_results = self._RunPresubmit(args,
1444 description,
1445 use_python3=True,
1446 resultdb=resultdb,
1447 realm=realm)
1448 if py3_results.get('skipped_presubmits', 1) == 0:
1449 print('No more presubmits to run - skipping Python 2 presubmits.')
1450 return py3_results
1451
1452 py2_results = self._RunPresubmit(args,
1453 description,
1454 use_python3=False,
1455 resultdb=resultdb,
1456 realm=realm)
1457 return self._MergePresubmitResults(py2_results, py3_results)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001458
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001459 def _RunPresubmit(self,
1460 args,
1461 description,
1462 use_python3,
1463 resultdb=None,
1464 realm=None):
1465 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1466 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001467 args = args[:]
1468 vpython = 'vpython3' if use_python3 else 'vpython'
1469
Edward Lemur227d5102020-02-25 23:45:35 +00001470 with gclient_utils.temporary_file() as description_file:
1471 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001472 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001473 args.extend(['--json_output', json_output])
1474 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001475 if self.GetUsePython3():
1476 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001477 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001478 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001479 if resultdb and realm:
1480 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001481
1482 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001483 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001484
Edward Lemur227d5102020-02-25 23:45:35 +00001485 metrics.collector.add_repeated('sub_commands', {
1486 'command': 'presubmit',
1487 'execution_time': time_time() - start,
1488 'exit_code': exit_code,
1489 })
1490
1491 if exit_code:
1492 sys.exit(exit_code)
1493
1494 json_results = gclient_utils.FileRead(json_output)
1495 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001496
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001497 def _MergePresubmitResults(self, py2_results, py3_results):
1498 return {
1499 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1500 py3_results.get('more_cc', []))),
1501 'errors': (
1502 py2_results.get('errors', []) + py3_results.get('errors', [])),
1503 'notifications': (
1504 py2_results.get('notifications', []) +
1505 py3_results.get('notifications', [])),
1506 'warnings': (
1507 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1508 }
1509
Brian Sheedy7326ca22022-11-02 18:36:17 +00001510 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001511 args = self._GetCommonPresubmitArgs(verbose, upstream)
1512 args.append('--post_upload')
1513
1514 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001515 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001516 args.extend(['--description_file', description_file])
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001517 if not py3_only:
1518 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1519 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1520 ['--use-python3'])
1521 if not py3_only:
1522 p_py2.wait()
1523 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001524
Edward Lemur5a644f82020-03-18 16:44:57 +00001525 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001526 # type: (optparse.Values, Sequence[str], Sequence[str]
1527 # ) -> ChangeDescription
1528 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001529 if self.GetIssue():
1530 description = self.FetchDescription()
1531 elif options.message:
1532 description = options.message
1533 else:
1534 description = _create_description_from_log(git_diff_args)
1535 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001536 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001537
Edward Lemur5a644f82020-03-18 16:44:57 +00001538 bug = options.bug
1539 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001540 if not self.GetIssue():
1541 # Extract bug number from branch name, but only if issue is being created.
1542 # It must start with bug or fix, followed by _ or - and number.
1543 # Optionally, it may contain _ or - after number with arbitrary text.
1544 # Examples:
1545 # bug-123
1546 # bug_123
1547 # fix-123
1548 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001549 branch = self.GetBranch()
1550 if branch is not None:
1551 match = re.match(
1552 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1553 if not bug and not fixed and match:
1554 if match.group('type') == 'bug':
1555 bug = match.group('bugnum')
1556 else:
1557 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001558
1559 change_description = ChangeDescription(description, bug, fixed)
1560
Joanna Wang39811b12023-01-20 23:09:48 +00001561 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001563 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001564 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001565 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001566 missing_files = [
1567 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001568 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001569 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001570 owners = self.owners_client.SuggestOwners(
1571 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001572 assert isinstance(options.reviewers, list), options.reviewers
1573 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001574
Edward Lemur5a644f82020-03-18 16:44:57 +00001575 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001576 if options.reviewers:
1577 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001578
1579 return change_description
1580
Joanna Wanga1abbed2023-01-24 01:41:05 +00001581 def _GetTitleForUpload(self, options, multi_change_upload=False):
1582 # type: (optparse.Values, Optional[bool]) -> str
1583
1584 # Getting titles for multipl commits is not supported so we return the
1585 # default.
1586 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001587 return options.title
1588
1589 # On first upload, patchset title is always this string, while options.title
1590 # gets converted to first line of message.
1591 if not self.GetIssue():
1592 return 'Initial upload'
1593
1594 # When uploading subsequent patchsets, options.message is taken as the title
1595 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001596 if options.message:
1597 return options.message.strip()
1598
1599 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001600 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001601 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001602 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001603 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001604
1605 # Use the default title if the user confirms the default with a 'y'.
1606 if user_title.lower() == 'y':
1607 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001608 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001609
Joanna Wang562481d2023-01-26 21:57:14 +00001610 def _GetRefSpecOptions(self,
1611 options,
1612 change_desc,
1613 multi_change_upload=False,
1614 dogfood_path=False):
1615 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1616 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001617
1618 # Extra options that can be specified at push time. Doc:
1619 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1620 refspec_opts = []
1621
1622 # By default, new changes are started in WIP mode, and subsequent patchsets
1623 # don't send email. At any time, passing --send-mail or --send-email will
1624 # mark the change ready and send email for that particular patch.
1625 if options.send_mail:
1626 refspec_opts.append('ready')
1627 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001628 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001629 refspec_opts.append('wip')
1630 else:
1631 refspec_opts.append('notify=NONE')
1632
1633 # TODO(tandrii): options.message should be posted as a comment if
1634 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1635 # to do it.
1636
1637 # Set options.title in case user was prompted in _GetTitleForUpload and
1638 # _CMDUploadChange needs to be called again.
1639 options.title = self._GetTitleForUpload(
1640 options, multi_change_upload=multi_change_upload)
1641
1642 if options.title:
1643 # Punctuation and whitespace in |title| must be percent-encoded.
1644 refspec_opts.append('m=' +
1645 gerrit_util.PercentEncodeForGitRef(options.title))
1646
1647 if options.private:
1648 refspec_opts.append('private')
1649
1650 if options.topic:
1651 # Documentation on Gerrit topics is here:
1652 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1653 refspec_opts.append('topic=%s' % options.topic)
1654
1655 if options.enable_auto_submit:
1656 refspec_opts.append('l=Auto-Submit+1')
1657 if options.set_bot_commit:
1658 refspec_opts.append('l=Bot-Commit+1')
1659 if options.use_commit_queue:
1660 refspec_opts.append('l=Commit-Queue+2')
1661 elif options.cq_dry_run:
1662 refspec_opts.append('l=Commit-Queue+1')
1663 elif options.cq_quick_run:
1664 refspec_opts.append('l=Commit-Queue+1')
1665 refspec_opts.append('l=Quick-Run+1')
1666
1667 if change_desc.get_reviewers(tbr_only=True):
1668 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1669 self.GetGerritProject())
1670 refspec_opts.append('l=Code-Review+%s' % score)
1671
Joanna Wang40497912023-01-24 21:18:16 +00001672 # Gerrit sorts hashtags, so order is not important.
1673 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1674 # We check GetIssue because we only add hashtags from the
1675 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001676 # TODO(b/265929888): When we fully launch the new path:
1677 # 1) remove fetching hashtags from description alltogether
1678 # 2) Or use descrtiption hashtags for:
1679 # `not (self.GetIssue() and multi_change_upload)`
1680 # 3) Or enabled change description tags for multi and single changes
1681 # by adding them post `git push`.
1682 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001683 hashtags.update(change_desc.get_hash_tags())
1684 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001685
1686 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001687 # branch/change.
1688 return refspec_opts
1689
Joanna Wang05b60342023-03-29 20:25:57 +00001690 def PrepareSquashedCommit(self,
1691 options,
1692 parent,
1693 orig_parent,
1694 end_commit=None):
1695 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1696 """Create a squashed commit to upload.
1697
1698
1699 Args:
1700 parent: The commit to use as the parent for the new squashed.
1701 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1702 is part of the same original tree as end_commit, which does not
1703 contain squashed commits. This is used to create the change
1704 description for the new squashed commit with:
1705 `git log orig_parent..end_commit`.
1706 end_commit: The commit to use as the end of the new squashed commit.
1707 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001708
1709 if end_commit is None:
1710 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1711
Joanna Wang05b60342023-03-29 20:25:57 +00001712 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001713 end_commit)
1714 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1715 with gclient_utils.temporary_file() as desc_tempfile:
1716 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1717 commit_to_push = RunGit(
1718 ['commit-tree', latest_tree, '-p', parent, '-F',
1719 desc_tempfile]).strip()
1720
Joanna Wang7603f042023-03-01 22:17:36 +00001721 # Gerrit may or may not update fast enough to return the correct patchset
1722 # number after we push. Get the pre-upload patchset and increment later.
1723 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001724 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001725 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001726
Joanna Wang6215dd02023-02-07 15:58:03 +00001727 def PrepareCherryPickSquashedCommit(self, options, parent):
1728 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001729 """Create a commit cherry-picked on parent to push."""
1730
Joanna Wang6215dd02023-02-07 15:58:03 +00001731 # The `parent` is what we will cherry-pick on top of.
1732 # The `cherry_pick_base` is the beginning range of what
1733 # we are cherry-picking.
1734 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1735 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001736 self.branchref)
1737
1738 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1739 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1740 with gclient_utils.temporary_file() as desc_tempfile:
1741 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001742 commit_to_cp = RunGit([
1743 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1744 desc_tempfile
1745 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001746
Joanna Wang6215dd02023-02-07 15:58:03 +00001747 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001748 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1749 if ret:
1750 RunGit(['cherry-pick', '--abort'])
1751 RunGit(['checkout', '-q', self.branch])
1752 DieWithError('Could not cleanly cherry-pick')
1753
Joanna Wang6215dd02023-02-07 15:58:03 +00001754 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001755 RunGit(['checkout', '-q', self.branch])
1756
Joanna Wang7603f042023-03-01 22:17:36 +00001757 # Gerrit may or may not update fast enough to return the correct patchset
1758 # number after we push. Get the pre-upload patchset and increment later.
1759 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001760 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001761 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001762
Joanna Wangb46232e2023-01-21 01:58:46 +00001763 def _PrepareChange(self, options, parent, end_commit):
1764 # type: (optparse.Values, str, str) ->
1765 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1766 """Prepares the change to be uploaded."""
1767 self.EnsureCanUploadPatchset(options.force)
1768
1769 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1770 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1771 files)
1772
1773 watchlist = watchlists.Watchlists(settings.GetRoot())
1774 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1775 if not options.bypass_hooks:
1776 hook_results = self.RunHook(committing=False,
1777 may_prompt=not options.force,
1778 verbose=options.verbose,
1779 parallel=options.parallel,
1780 upstream=parent,
1781 description=change_desc.description,
1782 all_files=False)
1783 self.ExtendCC(hook_results['more_cc'])
1784
1785 # Update the change description and ensure we have a Change Id.
1786 if self.GetIssue():
1787 if options.edit_description:
1788 change_desc.prompt()
1789 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1790 change_id = change_detail['change_id']
1791 change_desc.ensure_change_id(change_id)
1792
Joanna Wangb46232e2023-01-21 01:58:46 +00001793 else: # No change issue. First time uploading
1794 if not options.force and not options.message_file:
1795 change_desc.prompt()
1796
1797 # Check if user added a change_id in the descripiton.
1798 change_ids = git_footers.get_footer_change_id(change_desc.description)
1799 if len(change_ids) == 1:
1800 change_id = change_ids[0]
1801 else:
1802 change_id = GenerateGerritChangeId(change_desc.description)
1803 change_desc.ensure_change_id(change_id)
1804
1805 if options.preserve_tryjobs:
1806 change_desc.set_preserve_tryjobs()
1807
1808 SaveDescriptionBackup(change_desc)
1809
1810 # Add ccs
1811 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001812 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001813 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001814 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001815 ccs = self.GetCCList().split(',')
1816 if len(ccs) > 100:
1817 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1818 'process/lsc/lsc_workflow.md')
1819 print('WARNING: This will auto-CC %s users.' % len(ccs))
1820 print('LSC may be more appropriate: %s' % lsc)
1821 print('You can also use the --no-autocc flag to disable auto-CC.')
1822 confirm_or_exit(action='continue')
1823
1824 # Add ccs from the --cc flag.
1825 if options.cc:
1826 ccs.extend(options.cc)
1827
1828 ccs = [email.strip() for email in ccs if email.strip()]
1829 if change_desc.get_cced():
1830 ccs.extend(change_desc.get_cced())
1831
1832 return change_desc.get_reviewers(), ccs, change_desc
1833
Joanna Wang40497912023-01-24 21:18:16 +00001834 def PostUploadUpdates(self, options, new_upload, change_number):
1835 # type: (optparse.Values, _NewUpload, change_number) -> None
1836 """Makes necessary post upload changes to the local and remote cl."""
1837 if not self.GetIssue():
1838 self.SetIssue(change_number)
1839
Joanna Wang7603f042023-03-01 22:17:36 +00001840 self.SetPatchset(new_upload.prev_patchset + 1)
1841
Joanna Wang40497912023-01-24 21:18:16 +00001842 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1843 new_upload.commit_to_push)
1844 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1845 new_upload.new_last_uploaded_commit)
1846
1847 if settings.GetRunPostUploadHook():
1848 self.RunPostUploadHook(options.verbose, new_upload.parent,
1849 new_upload.change_desc.description,
1850 options.no_python2_post_upload_hooks)
1851
1852 if new_upload.reviewers or new_upload.ccs:
1853 gerrit_util.AddReviewers(self.GetGerritHost(),
1854 self._GerritChangeIdentifier(),
1855 reviewers=new_upload.reviewers,
1856 ccs=new_upload.ccs,
1857 notify=bool(options.send_mail))
1858
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001859 def CMDUpload(self, options, git_diff_args, orig_args):
1860 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001861 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001862 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001863 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864 else:
1865 if self.GetBranch() is None:
1866 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1867
1868 # Default to diffing against common ancestor of upstream branch
1869 base_branch = self.GetCommonAncestorWithUpstream()
1870 git_diff_args = [base_branch, 'HEAD']
1871
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001872 # Fast best-effort checks to abort before running potentially expensive
1873 # hooks if uploading is likely to fail anyway. Passing these checks does
1874 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001875 self.EnsureAuthenticated(force=options.force)
1876 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001877
1878 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001879 watchlist = watchlists.Watchlists(settings.GetRoot())
1880 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001881 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001882 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001883
Edward Lemur5a644f82020-03-18 16:44:57 +00001884 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001885 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001886 hook_results = self.RunHook(committing=False,
1887 may_prompt=not options.force,
1888 verbose=options.verbose,
1889 parallel=options.parallel,
1890 upstream=base_branch,
1891 description=change_desc.description,
1892 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001893 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001894
Aaron Gable13101a62018-02-09 13:20:41 -08001895 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001896 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001897 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001898 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001899 if self.GetBranch() is not None:
1900 self._GitSetBranchConfigValue(
1901 LAST_UPLOAD_HASH_CONFIG_KEY,
1902 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001903 # Run post upload hooks, if specified.
1904 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001905 self.RunPostUploadHook(options.verbose, base_branch,
1906 change_desc.description,
1907 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001908
1909 # Upload all dependencies if specified.
1910 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001911 print()
1912 print('--dependencies has been specified.')
1913 print('All dependent local branches will be re-uploaded.')
1914 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001915 # Remove the dependencies flag from args so that we do not end up in a
1916 # loop.
1917 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001918 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001919 return ret
1920
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001921 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001922 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001923
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001924 Issue must have been already uploaded and known. Optionally allows for
1925 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001926 """
1927 assert new_state in _CQState.ALL_STATES
1928 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001929 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001930 vote_map = {
1931 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001932 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001933 _CQState.DRY_RUN: 1,
1934 _CQState.COMMIT: 2,
1935 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001936 if new_state == _CQState.QUICK_RUN:
1937 labels = {
1938 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1939 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1940 }
1941 else:
1942 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001943 notify = False if new_state == _CQState.DRY_RUN else None
1944 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001945 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001946 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001947 return 0
1948 except KeyboardInterrupt:
1949 raise
1950 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001951 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001952 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001953 ' * Your project has no CQ,\n'
1954 ' * You don\'t have permission to change the CQ state,\n'
1955 ' * There\'s a bug in this code (see stack trace below).\n'
1956 'Consider specifying which bots to trigger manually or asking your '
1957 'project owners for permissions or contacting Chrome Infra at:\n'
1958 'https://www.chromium.org/infra\n\n' %
1959 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001960 # Still raise exception so that stack trace is printed.
1961 raise
1962
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001963 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001964 # Lazy load of configs.
1965 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001966 if self._gerrit_host and '.' not in self._gerrit_host:
1967 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1968 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001969 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001970 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001971 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001972 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001973 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1974 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001975 return self._gerrit_host
1976
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001977 def _GetGitHost(self):
1978 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001979 remote_url = self.GetRemoteUrl()
1980 if not remote_url:
1981 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001982 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001983
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001984 def GetCodereviewServer(self):
1985 if not self._gerrit_server:
1986 # If we're on a branch then get the server potentially associated
1987 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001988 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001989 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001990 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001991 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001992 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001993 if not self._gerrit_server:
1994 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1995 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001996 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001997 parts[0] = parts[0] + '-review'
1998 self._gerrit_host = '.'.join(parts)
1999 self._gerrit_server = 'https://%s' % self._gerrit_host
2000 return self._gerrit_server
2001
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002002 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002003 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002004 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002005 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002006 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002007 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002008 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002009 if project.endswith('.git'):
2010 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002011 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2012 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2013 # gitiles/git-over-https protocol. E.g.,
2014 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2015 # as
2016 # https://chromium.googlesource.com/v8/v8
2017 if project.startswith('a/'):
2018 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002019 return project
2020
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002021 def _GerritChangeIdentifier(self):
2022 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2023
2024 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002025 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002026 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002027 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002028 if project:
2029 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2030 # Fall back on still unique, but less efficient change number.
2031 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002032
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002033 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002034 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002035 if settings.GetGerritSkipEnsureAuthenticated():
2036 # For projects with unusual authentication schemes.
2037 # See http://crbug.com/603378.
2038 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002039
2040 # Check presence of cookies only if using cookies-based auth method.
2041 cookie_auth = gerrit_util.Authenticator.get()
2042 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002043 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002044
Florian Mayerae510e82020-01-30 21:04:48 +00002045 remote_url = self.GetRemoteUrl()
2046 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002047 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002048 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002049 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2050 logging.warning(
2051 'Ignoring branch %(branch)s with non-https/sso remote '
2052 '%(remote)s', {
2053 'branch': self.branch,
2054 'remote': self.GetRemoteUrl()
2055 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002056 return
2057
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002058 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002059 self.GetCodereviewServer()
2060 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002061 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002062
2063 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2064 git_auth = cookie_auth.get_auth_header(git_host)
2065 if gerrit_auth and git_auth:
2066 if gerrit_auth == git_auth:
2067 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002068 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002069 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002070 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002071 ' %s\n'
2072 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002073 ' Consider running the following command:\n'
2074 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002075 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002076 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002077 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002078 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002079 cookie_auth.get_new_password_message(git_host)))
2080 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002081 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002082 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002083
2084 missing = (
2085 ([] if gerrit_auth else [self._gerrit_host]) +
2086 ([] if git_auth else [git_host]))
2087 DieWithError('Credentials for the following hosts are required:\n'
2088 ' %s\n'
2089 'These are read from %s (or legacy %s)\n'
2090 '%s' % (
2091 '\n '.join(missing),
2092 cookie_auth.get_gitcookies_path(),
2093 cookie_auth.get_netrc_path(),
2094 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002095
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002096 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002097 if not self.GetIssue():
2098 return
2099
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002100 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002101 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002102 DieWithError(
2103 'Change %s has been abandoned, new uploads are not allowed' %
2104 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002105 if status == 'MERGED':
2106 answer = gclient_utils.AskForData(
2107 'Change %s has been submitted, new uploads are not allowed. '
2108 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2109 ).lower()
2110 if answer not in ('y', ''):
2111 DieWithError('New uploads are not allowed.')
2112 self.SetIssue()
2113 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002114
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002115 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2116 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2117 # Apparently this check is not very important? Otherwise get_auth_email
2118 # could have been added to other implementations of Authenticator.
2119 cookies_auth = gerrit_util.Authenticator.get()
2120 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002121 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002122
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002123 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002124 if self.GetIssueOwner() == cookies_user:
2125 return
2126 logging.debug('change %s owner is %s, cookies user is %s',
2127 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002128 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002129 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002130 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002131 if details['email'] == self.GetIssueOwner():
2132 return
2133 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002134 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002135 'as %s.\n'
2136 'Uploading may fail due to lack of permissions.' %
2137 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2138 confirm_or_exit(action='upload')
2139
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002140 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002141 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002142 or CQ status, assuming adherence to a common workflow.
2143
2144 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002145 * 'error' - error from review tool (including deleted issues)
2146 * 'unsent' - no reviewers added
2147 * 'waiting' - waiting for review
2148 * 'reply' - waiting for uploader to reply to review
2149 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002150 * 'dry-run' - dry-running in the CQ
2151 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002152 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002153 """
2154 if not self.GetIssue():
2155 return None
2156
2157 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002158 data = self._GetChangeDetail([
2159 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002160 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002161 return 'error'
2162
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002163 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002164 return 'closed'
2165
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002166 cq_label = data['labels'].get('Commit-Queue', {})
2167 max_cq_vote = 0
2168 for vote in cq_label.get('all', []):
2169 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2170 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002171 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002172 if max_cq_vote == 1:
2173 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002174
Aaron Gable9ab38c62017-04-06 14:36:33 -07002175 if data['labels'].get('Code-Review', {}).get('approved'):
2176 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002177
2178 if not data.get('reviewers', {}).get('REVIEWER', []):
2179 return 'unsent'
2180
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002181 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002182 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002183 while messages:
2184 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002185 if (m.get('tag', '').startswith('autogenerated:cq') or
2186 m.get('tag', '').startswith('autogenerated:cv')):
2187 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002188 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002189 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002190 # Most recent message was by owner.
2191 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002192
2193 # Some reply from non-owner.
2194 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002195
2196 # Somehow there are no messages even though there are reviewers.
2197 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002198
Gavin Mak4e5e3992022-11-14 22:40:12 +00002199 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002200 if not self.GetIssue():
2201 return None
2202
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002203 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002204 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002205 if update:
2206 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002207 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002208
Gavin Makf35a9eb2022-11-17 18:34:36 +00002209 def _IsPatchsetRangeSignificant(self, lower, upper):
2210 """Returns True if the inclusive range of patchsets contains any reworks or
2211 rebases."""
2212 if not self.GetIssue():
2213 return False
2214
2215 data = self._GetChangeDetail(['ALL_REVISIONS'])
2216 ps_kind = {}
2217 for rev_info in data.get('revisions', {}).values():
2218 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2219
2220 for ps in range(lower, upper + 1):
2221 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2222 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2223 return True
2224 return False
2225
Gavin Make61ccc52020-11-13 00:12:57 +00002226 def GetMostRecentDryRunPatchset(self):
2227 """Get patchsets equivalent to the most recent patchset and return
2228 the patchset with the latest dry run. If none have been dry run, return
2229 the latest patchset."""
2230 if not self.GetIssue():
2231 return None
2232
2233 data = self._GetChangeDetail(['ALL_REVISIONS'])
2234 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002235 dry_run = {int(m['_revision_number'])
2236 for m in data.get('messages', [])
2237 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002238
2239 for revision_info in sorted(data.get('revisions', {}).values(),
2240 key=lambda c: c['_number'], reverse=True):
2241 if revision_info['_number'] in dry_run:
2242 patchset = revision_info['_number']
2243 break
2244 if revision_info.get('kind', '') not in \
2245 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2246 break
2247 self.SetPatchset(patchset)
2248 return patchset
2249
Aaron Gable636b13f2017-07-14 10:42:48 -07002250 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002251 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002252 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002253 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002254
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002255 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002256 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002257 # CURRENT_REVISION is included to get the latest patchset so that
2258 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002259 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002260 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2261 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002262 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002263 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002264 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002265 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002266
2267 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002268 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002269 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002270 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002271 line_comments = file_comments.setdefault(path, [])
2272 line_comments.extend(
2273 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002274
2275 # Build dictionary of file comments for easy access and sorting later.
2276 # {author+date: {path: {patchset: {line: url+message}}}}
2277 comments = collections.defaultdict(
2278 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002279
2280 server = self.GetCodereviewServer()
2281 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2282 # /c/ is automatically added by short URL server.
2283 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2284 self.GetIssue())
2285 else:
2286 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2287
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002288 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002289 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002290 tag = comment.get('tag', '')
2291 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002292 continue
2293 key = (comment['author']['email'], comment['updated'])
2294 if comment.get('side', 'REVISION') == 'PARENT':
2295 patchset = 'Base'
2296 else:
2297 patchset = 'PS%d' % comment['patch_set']
2298 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002299 url = ('%s/%s/%s#%s%s' %
2300 (url_prefix, comment['patch_set'], path,
2301 'b' if comment.get('side') == 'PARENT' else '',
2302 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002303 comments[key][path][patchset][line] = (url, comment['message'])
2304
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002305 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002306 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002307 summary = self._BuildCommentSummary(msg, comments, readable)
2308 if summary:
2309 summaries.append(summary)
2310 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002311
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002312 @staticmethod
2313 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002314 if 'email' not in msg['author']:
2315 # Some bot accounts may not have an email associated.
2316 return None
2317
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002318 key = (msg['author']['email'], msg['date'])
2319 # Don't bother showing autogenerated messages that don't have associated
2320 # file or line comments. this will filter out most autogenerated
2321 # messages, but will keep robot comments like those from Tricium.
2322 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2323 if is_autogenerated and not comments.get(key):
2324 return None
2325 message = msg['message']
2326 # Gerrit spits out nanoseconds.
2327 assert len(msg['date'].split('.')[-1]) == 9
2328 date = datetime.datetime.strptime(msg['date'][:-3],
2329 '%Y-%m-%d %H:%M:%S.%f')
2330 if key in comments:
2331 message += '\n'
2332 for path, patchsets in sorted(comments.get(key, {}).items()):
2333 if readable:
2334 message += '\n%s' % path
2335 for patchset, lines in sorted(patchsets.items()):
2336 for line, (url, content) in sorted(lines.items()):
2337 if line:
2338 line_str = 'Line %d' % line
2339 path_str = '%s:%d:' % (path, line)
2340 else:
2341 line_str = 'File comment'
2342 path_str = '%s:0:' % path
2343 if readable:
2344 message += '\n %s, %s: %s' % (patchset, line_str, url)
2345 message += '\n %s\n' % content
2346 else:
2347 message += '\n%s ' % path_str
2348 message += '\n%s\n' % content
2349
2350 return _CommentSummary(
2351 date=date,
2352 message=message,
2353 sender=msg['author']['email'],
2354 autogenerated=is_autogenerated,
2355 # These could be inferred from the text messages and correlated with
2356 # Code-Review label maximum, however this is not reliable.
2357 # Leaving as is until the need arises.
2358 approval=False,
2359 disapproval=False,
2360 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002361
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002362 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002363 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002364 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002365
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002366 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002367 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002368 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002369
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002370 def _GetChangeDetail(self, options=None):
2371 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002373 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002374
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002375 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002376 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002377 options.append('CURRENT_COMMIT')
2378
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002379 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002380 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002381 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002382
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002383 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2384 # Assumption: data fetched before with extra options is suitable
2385 # for return for a smaller set of options.
2386 # For example, if we cached data for
2387 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2388 # and request is for options=[CURRENT_REVISION],
2389 # THEN we can return prior cached data.
2390 if options_set.issubset(cached_options_set):
2391 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002392
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002393 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002394 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002395 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002396 except gerrit_util.GerritError as e:
2397 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002398 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002399 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002400
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002401 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002402 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002403
Gavin Mak4e5e3992022-11-14 22:40:12 +00002404 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002405 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002406 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002407 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2408 self._GerritChangeIdentifier(),
2409 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002410 except gerrit_util.GerritError as e:
2411 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002412 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002413 raise
agable32978d92016-11-01 12:55:02 -07002414 return data
2415
Karen Qian40c19422019-03-13 21:28:29 +00002416 def _IsCqConfigured(self):
2417 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002418 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002419
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002420 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002421 if git_common.is_dirty_git_tree('land'):
2422 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002423
tandriid60367b2016-06-22 05:25:12 -07002424 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002425 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002426 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002427 'which can test and land changes for you. '
2428 'Are you sure you wish to bypass it?\n',
2429 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002430 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002431 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002432 # Note: git diff outputs nothing if there is no diff.
2433 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002434 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002435 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002436 if detail['current_revision'] == last_upload:
2437 differs = False
2438 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002439 print('WARNING: Local branch contents differ from latest uploaded '
2440 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002441 if differs:
2442 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002443 confirm_or_exit(
2444 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2445 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002446 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002447 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002448 upstream = self.GetCommonAncestorWithUpstream()
2449 if self.GetIssue():
2450 description = self.FetchDescription()
2451 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002452 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002453 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002454 committing=True,
2455 may_prompt=not force,
2456 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002457 parallel=parallel,
2458 upstream=upstream,
2459 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002460 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002461 resultdb=resultdb,
2462 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002463
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002464 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002465 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002466 links = self._GetChangeCommit().get('web_links', [])
2467 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002468 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002469 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002470 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002471 return 0
2472
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002473 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2474 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002475 assert parsed_issue_arg.valid
2476
Edward Lemur125d60a2019-09-13 18:25:41 +00002477 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002478
2479 if parsed_issue_arg.hostname:
2480 self._gerrit_host = parsed_issue_arg.hostname
2481 self._gerrit_server = 'https://%s' % self._gerrit_host
2482
tandriic2405f52016-10-10 08:13:15 -07002483 try:
2484 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002485 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002486 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002487
2488 if not parsed_issue_arg.patchset:
2489 # Use current revision by default.
2490 revision_info = detail['revisions'][detail['current_revision']]
2491 patchset = int(revision_info['_number'])
2492 else:
2493 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002494 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002495 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2496 break
2497 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002498 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002499 (parsed_issue_arg.patchset, self.GetIssue()))
2500
Edward Lemur125d60a2019-09-13 18:25:41 +00002501 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002502 if remote_url.endswith('.git'):
2503 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002504 remote_url = remote_url.rstrip('/')
2505
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002506 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002507 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002508
2509 if remote_url != fetch_info['url']:
2510 DieWithError('Trying to patch a change from %s but this repo appears '
2511 'to be %s.' % (fetch_info['url'], remote_url))
2512
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002513 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002514
Joanna Wangc023a632023-01-26 17:59:25 +00002515 # Set issue immediately in case the cherry-pick fails, which happens
2516 # when resolving conflicts.
2517 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002518 self.SetIssue(parsed_issue_arg.issue)
2519
Aaron Gable62619a32017-06-16 08:22:09 -07002520 if force:
2521 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2522 print('Checked out commit for change %i patchset %i locally' %
2523 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002524 elif nocommit:
2525 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2526 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002527 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002528 RunGit(['cherry-pick', 'FETCH_HEAD'])
2529 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002530 (parsed_issue_arg.issue, patchset))
2531 print('Note: this created a local commit which does not have '
2532 'the same hash as the one uploaded for review. This will make '
2533 'uploading changes based on top of this branch difficult.\n'
2534 'If you want to do that, use "git cl patch --force" instead.')
2535
Stefan Zagerd08043c2017-10-12 12:07:02 -07002536 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002537 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002538 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002539 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2540 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002541 else:
2542 print('WARNING: You are in detached HEAD state.\n'
2543 'The patch has been applied to your checkout, but you will not be '
2544 'able to upload a new patch set to the gerrit issue.\n'
2545 'Try using the \'-b\' option if you would like to work on a '
2546 'branch and/or upload a new patch set.')
2547
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002548 return 0
2549
Joanna Wang18de1f62023-01-21 01:24:24 +00002550 @staticmethod
2551 def _GerritCommitMsgHookCheck(offer_removal):
2552 # type: (bool) -> None
2553 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002554 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2555 if not os.path.exists(hook):
2556 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002557 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2558 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002559 data = gclient_utils.FileRead(hook)
2560 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2561 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002562 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002563 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002564 'and may interfere with it in subtle ways.\n'
2565 'We recommend you remove the commit-msg hook.')
2566 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002567 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002568 gclient_utils.rm_file_or_tree(hook)
2569 print('Gerrit commit-msg hook removed.')
2570 else:
2571 print('OK, will keep Gerrit commit-msg hook in place.')
2572
Edward Lemur1b52d872019-05-09 21:12:12 +00002573 def _CleanUpOldTraces(self):
2574 """Keep only the last |MAX_TRACES| traces."""
2575 try:
2576 traces = sorted([
2577 os.path.join(TRACES_DIR, f)
2578 for f in os.listdir(TRACES_DIR)
2579 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2580 and not f.startswith('tmp'))
2581 ])
2582 traces_to_delete = traces[:-MAX_TRACES]
2583 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002584 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002585 except OSError:
2586 print('WARNING: Failed to remove old git traces from\n'
2587 ' %s'
2588 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002589
Edward Lemur5737f022019-05-17 01:24:00 +00002590 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002591 """Zip and write the git push traces stored in traces_dir."""
2592 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002593 traces_zip = trace_name + '-traces'
2594 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002595 # Create a temporary dir to store git config and gitcookies in. It will be
2596 # compressed and stored next to the traces.
2597 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002598 git_info_zip = trace_name + '-git-info'
2599
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002600 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002601
Edward Lemur1b52d872019-05-09 21:12:12 +00002602 git_push_metadata['trace_name'] = trace_name
2603 gclient_utils.FileWrite(
2604 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2605
2606 # Keep only the first 6 characters of the git hashes on the packet
2607 # trace. This greatly decreases size after compression.
2608 packet_traces = os.path.join(traces_dir, 'trace-packet')
2609 if os.path.isfile(packet_traces):
2610 contents = gclient_utils.FileRead(packet_traces)
2611 gclient_utils.FileWrite(
2612 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2613 shutil.make_archive(traces_zip, 'zip', traces_dir)
2614
2615 # Collect and compress the git config and gitcookies.
2616 git_config = RunGit(['config', '-l'])
2617 gclient_utils.FileWrite(
2618 os.path.join(git_info_dir, 'git-config'),
2619 git_config)
2620
2621 cookie_auth = gerrit_util.Authenticator.get()
2622 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2623 gitcookies_path = cookie_auth.get_gitcookies_path()
2624 if os.path.isfile(gitcookies_path):
2625 gitcookies = gclient_utils.FileRead(gitcookies_path)
2626 gclient_utils.FileWrite(
2627 os.path.join(git_info_dir, 'gitcookies'),
2628 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2629 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2630
Edward Lemur1b52d872019-05-09 21:12:12 +00002631 gclient_utils.rmtree(git_info_dir)
2632
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002633 def _RunGitPushWithTraces(self,
2634 refspec,
2635 refspec_opts,
2636 git_push_metadata,
2637 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002638 """Run git push and collect the traces resulting from the execution."""
2639 # Create a temporary directory to store traces in. Traces will be compressed
2640 # and stored in a 'traces' dir inside depot_tools.
2641 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002642 trace_name = os.path.join(
2643 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002644
2645 env = os.environ.copy()
2646 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2647 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002648 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002649 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2650 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2651 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2652
2653 try:
2654 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002655 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002656 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002657 push_cmd = ['git', 'push', remote_url, refspec]
2658 if git_push_options:
2659 for opt in git_push_options:
2660 push_cmd.extend(['-o', opt])
2661
Edward Lemur0f58ae42019-04-30 17:24:12 +00002662 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002663 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002664 env=env,
2665 print_stdout=True,
2666 # Flush after every line: useful for seeing progress when running as
2667 # recipe.
2668 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002669 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002670 except subprocess2.CalledProcessError as e:
2671 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002672 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002673 raise GitPushError(
2674 'Failed to create a change, very likely due to blocked keyword. '
2675 'Please examine output above for the reason of the failure.\n'
2676 'If this is a false positive, you can try to bypass blocked '
2677 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002678 '-o banned-words~skip, e.g.:\n'
2679 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002680 'If git-cl is not working correctly, file a bug under the '
2681 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002682 if 'git push -o nokeycheck' in str(e.stdout):
2683 raise GitPushError(
2684 'Failed to create a change, very likely due to a private key being '
2685 'detected. Please examine output above for the reason of the '
2686 'failure.\n'
2687 'If this is a false positive, you can try to bypass private key '
2688 'detection by using push option '
2689 '-o nokeycheck, e.g.:\n'
2690 'git cl upload -o nokeycheck\n\n'
2691 'If git-cl is not working correctly, file a bug under the '
2692 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002693
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002694 raise GitPushError(
2695 'Failed to create a change. Please examine output above for the '
2696 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002697 'For emergencies, Googlers can escalate to '
2698 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002699 'Hint: run command below to diagnose common Git/Gerrit '
2700 'credential problems:\n'
2701 ' git cl creds-check\n'
2702 '\n'
2703 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2704 'component including the files below.\n'
2705 'Review the files before upload, since they might contain sensitive '
2706 'information.\n'
2707 'Set the Restrict-View-Google label so that they are not publicly '
2708 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002709 finally:
2710 execution_time = time_time() - before_push
2711 metrics.collector.add_repeated('sub_commands', {
2712 'command': 'git push',
2713 'execution_time': execution_time,
2714 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002715 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002716 })
2717
Edward Lemur1b52d872019-05-09 21:12:12 +00002718 git_push_metadata['execution_time'] = execution_time
2719 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002720 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002721
Edward Lemur1b52d872019-05-09 21:12:12 +00002722 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002723 gclient_utils.rmtree(traces_dir)
2724
2725 return push_stdout
2726
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002727 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2728 change_desc):
2729 """Upload the current branch to Gerrit, retry if new remote HEAD is
2730 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002731 remote, remote_branch = self.GetRemoteBranch()
2732 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2733
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002734 try:
2735 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002736 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002737 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002738 # Repository might be in the middle of transition to main branch as
2739 # default, and uploads to old default might be blocked.
2740 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002741 DieWithError(str(e), change_desc)
2742
Josip Sokcevicb631a882021-01-06 18:18:10 +00002743 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2744 self.GetGerritProject())
2745 if project_head == branch:
2746 DieWithError(str(e), change_desc)
2747 branch = project_head
2748
2749 print("WARNING: Fetching remote state and retrying upload to default "
2750 "branch...")
2751 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002752 options.edit_description = False
2753 options.force = True
2754 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002755 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2756 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002757 except GitPushError as e:
2758 DieWithError(str(e), change_desc)
2759
2760 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002761 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002762 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002764 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002765 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002766 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002767 # User requested to change description
2768 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002769 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002770 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2771 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002772 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002773
2774 # Check if changes outside of this workspace have been uploaded.
2775 current_rev = change_detail['current_revision']
2776 last_uploaded_rev = self._GitGetBranchConfigValue(
2777 GERRIT_SQUASH_HASH_CONFIG_KEY)
2778 if last_uploaded_rev and current_rev != last_uploaded_rev:
2779 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002780 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002781 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002782 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002783 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002784 if len(change_ids) == 1:
2785 change_id = change_ids[0]
2786 else:
2787 change_id = GenerateGerritChangeId(change_desc.description)
2788 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002789
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002790 if options.preserve_tryjobs:
2791 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002792
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002793 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002794 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002795 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002796 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002797 with gclient_utils.temporary_file() as desc_tempfile:
2798 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2799 ref_to_push = RunGit(
2800 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002801 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002802 if options.no_add_changeid:
2803 pass
2804 else: # adding Change-Ids is okay.
2805 if not git_footers.get_footer_change_id(change_desc.description):
2806 DownloadGerritHook(False)
2807 change_desc.set_description(
2808 self._AddChangeIdToCommitMessage(change_desc.description,
2809 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002810 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002811 # For no-squash mode, we assume the remote called "origin" is the one we
2812 # want. It is not worthwhile to support different workflows for
2813 # no-squash mode.
2814 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002815 # attempt to extract the changeid from the current description
2816 # fail informatively if not possible.
2817 change_id_candidates = git_footers.get_footer_change_id(
2818 change_desc.description)
2819 if not change_id_candidates:
2820 DieWithError("Unable to extract change-id from message.")
2821 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002822
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002823 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002824 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2825 ref_to_push)]).splitlines()
2826 if len(commits) > 1:
2827 print('WARNING: This will upload %d commits. Run the following command '
2828 'to see which commits will be uploaded: ' % len(commits))
2829 print('git log %s..%s' % (parent, ref_to_push))
2830 print('You can also use `git squash-branch` to squash these into a '
2831 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002832 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002833
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002834 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002835 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002836 # Add default, watchlist, presubmit ccs if this is the initial upload
2837 # and CL is not private and auto-ccing has not been disabled.
2838 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002839 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002840 if len(cc) > 100:
2841 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2842 'process/lsc/lsc_workflow.md')
2843 print('WARNING: This will auto-CC %s users.' % len(cc))
2844 print('LSC may be more appropriate: %s' % lsc)
2845 print('You can also use the --no-autocc flag to disable auto-CC.')
2846 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002847 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002848 if options.cc:
2849 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002850 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002851 if change_desc.get_cced():
2852 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002853 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002854 valid_accounts = set(reviewers + cc)
2855 # TODO(crbug/877717): relax this for all hosts.
2856 else:
2857 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002858 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002859 logging.info('accounts %s are recognized, %s invalid',
2860 sorted(valid_accounts),
2861 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002862
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002863 # Extra options that can be specified at push time. Doc:
2864 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002865 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002866
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002867 for r in sorted(reviewers):
2868 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002869 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002870 reviewers.remove(r)
2871 else:
2872 # TODO(tandrii): this should probably be a hard failure.
2873 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2874 % r)
2875 for c in sorted(cc):
2876 # refspec option will be rejected if cc doesn't correspond to an
2877 # account, even though REST call to add such arbitrary cc may succeed.
2878 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002879 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002880 cc.remove(c)
2881
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002882 refspec_suffix = ''
2883 if refspec_opts:
2884 refspec_suffix = '%' + ','.join(refspec_opts)
2885 assert ' ' not in refspec_suffix, (
2886 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2887 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002888
Edward Lemur1b52d872019-05-09 21:12:12 +00002889 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002890 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002891 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002892 'change_id': change_id,
2893 'description': change_desc.description,
2894 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002895
Gavin Mak4e5e3992022-11-14 22:40:12 +00002896 # Gerrit may or may not update fast enough to return the correct patchset
2897 # number after we push. Get the pre-upload patchset and increment later.
2898 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2899
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002900 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002901 git_push_metadata,
2902 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002903
2904 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002905 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906 change_numbers = [m.group(1)
2907 for m in map(regex.match, push_stdout.splitlines())
2908 if m]
2909 if len(change_numbers) != 1:
2910 DieWithError(
2911 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002912 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002913 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002914 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002915 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002916
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002917 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002918 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002919 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002920 gerrit_util.AddReviewers(self.GetGerritHost(),
2921 self._GerritChangeIdentifier(),
2922 reviewers,
2923 cc,
2924 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002925
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002926 return 0
2927
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002928 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2929 change_desc):
2930 """Computes parent of the generated commit to be uploaded to Gerrit.
2931
2932 Returns revision or a ref name.
2933 """
2934 if custom_cl_base:
2935 # Try to avoid creating additional unintended CLs when uploading, unless
2936 # user wants to take this risk.
2937 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2938 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2939 local_ref_of_target_remote])
2940 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002941 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002942 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2943 'If you proceed with upload, more than 1 CL may be created by '
2944 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2945 'If you are certain that specified base `%s` has already been '
2946 'uploaded to Gerrit as another CL, you may proceed.\n' %
2947 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2948 if not force:
2949 confirm_or_exit(
2950 'Do you take responsibility for cleaning up potential mess '
2951 'resulting from proceeding with upload?',
2952 action='upload')
2953 return custom_cl_base
2954
Aaron Gablef97e33d2017-03-30 15:44:27 -07002955 if remote != '.':
2956 return self.GetCommonAncestorWithUpstream()
2957
2958 # If our upstream branch is local, we base our squashed commit on its
2959 # squashed version.
2960 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2961
Aaron Gablef97e33d2017-03-30 15:44:27 -07002962 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002963 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002964 if upstream_branch_name == 'main':
2965 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002966
2967 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002968 # TODO(tandrii): consider checking parent change in Gerrit and using its
2969 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2970 # the tree hash of the parent branch. The upside is less likely bogus
2971 # requests to reupload parent change just because it's uploadhash is
2972 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002973 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2974 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002975 # Verify that the upstream branch has been uploaded too, otherwise
2976 # Gerrit will create additional CLs when uploading.
2977 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2978 RunGitSilent(['rev-parse', parent + ':'])):
2979 DieWithError(
2980 '\nUpload upstream branch %s first.\n'
2981 'It is likely that this branch has been rebased since its last '
2982 'upload, so you just need to upload it again.\n'
2983 '(If you uploaded it with --no-squash, then branch dependencies '
2984 'are not supported, and you should reupload with --squash.)'
2985 % upstream_branch_name,
2986 change_desc)
2987 return parent
2988
Gavin Mak4e5e3992022-11-14 22:40:12 +00002989 def _UpdateWithExternalChanges(self):
2990 """Updates workspace with external changes.
2991
2992 Returns the commit hash that should be used as the merge base on upload.
2993 """
2994 local_ps = self.GetPatchset()
2995 if local_ps is None:
2996 return
2997
2998 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002999 if external_ps is None or local_ps == external_ps or \
3000 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003001 return
3002
3003 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00003004 if num_changes > 1:
3005 change_words = 'changes were'
3006 else:
3007 change_words = 'change was'
3008 print('\n%d external %s published to %s:\n' %
3009 (num_changes, change_words, self.GetIssueURL(short=True)))
3010
3011 # Print an overview of external changes.
3012 ps_to_commit = {}
3013 ps_to_info = {}
3014 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
3015 for commit_id, revision_info in revisions.get('revisions', {}).items():
3016 ps_num = revision_info['_number']
3017 ps_to_commit[ps_num] = commit_id
3018 ps_to_info[ps_num] = revision_info
3019
3020 for ps in range(external_ps, local_ps, -1):
3021 commit = ps_to_commit[ps][:8]
3022 desc = ps_to_info[ps].get('description', '')
3023 print('Patchset %d [%s] %s' % (ps, commit, desc))
3024
3025 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3026 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003027 return
3028
3029 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3030 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3031 external_base = external_parent['commit']
3032
3033 branch = git_common.current_branch()
3034 local_base = self.GetCommonAncestorWithUpstream()
3035 if local_base != external_base:
3036 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3037 (local_base, external_base))
3038 if git_common.upstream(branch):
3039 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3040 'to make these the same.')
3041 print('No upstream branch set. Consider setting it and using '
3042 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3043
3044 # Fetch Gerrit's CL base if it doesn't exist locally.
3045 remote, _ = self.GetRemoteBranch()
3046 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3047 RunGitSilent(['fetch', remote, external_base])
3048
3049 # Get the diff between local_ps and external_ps.
3050 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003051 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003052 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3053 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3054 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3055 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3056 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3057
3058 # Diff can be empty in the case of trivial rebases.
3059 if not diff:
3060 return external_base
3061
3062 # Apply the diff.
3063 with gclient_utils.temporary_file() as diff_tempfile:
3064 gclient_utils.FileWrite(diff_tempfile, diff)
3065 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3066 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3067 if not clean_patch:
3068 # Normally patchset is set after upload. But because we exit, that never
3069 # happens. Updating here makes sure that subsequent uploads don't need
3070 # to fetch/apply the same diff again.
3071 self.SetPatchset(external_ps)
3072 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3073 'conflicts and reupload.')
3074
3075 message = 'Incorporate external changes from '
3076 if num_changes == 1:
3077 message += 'patchset %d' % external_ps
3078 else:
3079 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3080 RunGitSilent(['commit', '-am', message])
3081 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3082 # patchset title instead of this 'Incorporate' message.
3083 return external_base
3084
Edward Lemura12175c2020-03-09 16:58:26 +00003085 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003086 """Re-commits using the current message, assumes the commit hook is in
3087 place.
3088 """
Edward Lemura12175c2020-03-09 16:58:26 +00003089 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003090 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003091 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003092 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003093 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003094
3095 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003096
tandriie113dfd2016-10-11 10:20:12 -07003097 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003098 try:
3099 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003100 except GerritChangeNotExists:
3101 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003102
3103 if data['status'] in ('ABANDONED', 'MERGED'):
3104 return 'CL %s is closed' % self.GetIssue()
3105
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003106 def GetGerritChange(self, patchset=None):
3107 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003108 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003109 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003110 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003111 data = self._GetChangeDetail(['ALL_REVISIONS'])
3112
3113 assert host and issue and patchset, 'CL must be uploaded first'
3114
3115 has_patchset = any(
3116 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003117 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003118 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003119 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003120 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003121
tandrii8c5a3532016-11-04 07:52:02 -07003122 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003123 'host': host,
3124 'change': issue,
3125 'project': data['project'],
3126 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003127 }
tandriie113dfd2016-10-11 10:20:12 -07003128
tandriide281ae2016-10-12 06:02:30 -07003129 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003130 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003131
Edward Lemur707d70b2018-02-07 00:50:14 +01003132 def GetReviewers(self):
3133 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003134 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003135
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003136
Lei Zhang8a0efc12020-08-05 19:58:45 +00003137def _get_bug_line_values(default_project_prefix, bugs):
3138 """Given default_project_prefix and comma separated list of bugs, yields bug
3139 line values.
tandriif9aefb72016-07-01 09:06:51 -07003140
3141 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003142 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003143 * string, which is left as is.
3144
3145 This function may produce more than one line, because bugdroid expects one
3146 project per line.
3147
Lei Zhang8a0efc12020-08-05 19:58:45 +00003148 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003149 ['v8:123', 'chromium:789']
3150 """
3151 default_bugs = []
3152 others = []
3153 for bug in bugs.split(','):
3154 bug = bug.strip()
3155 if bug:
3156 try:
3157 default_bugs.append(int(bug))
3158 except ValueError:
3159 others.append(bug)
3160
3161 if default_bugs:
3162 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003163 if default_project_prefix:
3164 if not default_project_prefix.endswith(':'):
3165 default_project_prefix += ':'
3166 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003167 else:
3168 yield default_bugs
3169 for other in sorted(others):
3170 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3171 yield other
3172
3173
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003174class ChangeDescription(object):
3175 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003176 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003177 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003178 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003179 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003180 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003181 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3182 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003183 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003184 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003185
Dan Beamd8b04ca2019-10-10 21:23:26 +00003186 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003187 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003188 if bug:
3189 regexp = re.compile(self.BUG_LINE)
3190 prefix = settings.GetBugPrefix()
3191 if not any((regexp.match(line) for line in self._description_lines)):
3192 values = list(_get_bug_line_values(prefix, bug))
3193 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003194 if fixed:
3195 regexp = re.compile(self.FIXED_LINE)
3196 prefix = settings.GetBugPrefix()
3197 if not any((regexp.match(line) for line in self._description_lines)):
3198 values = list(_get_bug_line_values(prefix, fixed))
3199 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003200
agable@chromium.org42c20792013-09-12 17:34:49 +00003201 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003202 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003203 return '\n'.join(self._description_lines)
3204
3205 def set_description(self, desc):
3206 if isinstance(desc, basestring):
3207 lines = desc.splitlines()
3208 else:
3209 lines = [line.rstrip() for line in desc]
3210 while lines and not lines[0]:
3211 lines.pop(0)
3212 while lines and not lines[-1]:
3213 lines.pop(-1)
3214 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215
Edward Lemur5a644f82020-03-18 16:44:57 +00003216 def ensure_change_id(self, change_id):
3217 description = self.description
3218 footer_change_ids = git_footers.get_footer_change_id(description)
3219 # Make sure that the Change-Id in the description matches the given one.
3220 if footer_change_ids != [change_id]:
3221 if footer_change_ids:
3222 # Remove any existing Change-Id footers since they don't match the
3223 # expected change_id footer.
3224 description = git_footers.remove_footer(description, 'Change-Id')
3225 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3226 'if you want to set a new one.')
3227 # Add the expected Change-Id footer.
3228 description = git_footers.add_footer_change_id(description, change_id)
3229 self.set_description(description)
3230
Joanna Wang39811b12023-01-20 23:09:48 +00003231 def update_reviewers(self, reviewers):
3232 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003233
3234 Args:
3235 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003236 """
Joanna Wang39811b12023-01-20 23:09:48 +00003237 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003238 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003239
3240 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003241
Joanna Wang39811b12023-01-20 23:09:48 +00003242 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 regexp = re.compile(self.R_LINE)
3244 matches = [regexp.match(line) for line in self._description_lines]
3245 new_desc = [l for i, l in enumerate(self._description_lines)
3246 if not matches[i]]
3247 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003248
Joanna Wang39811b12023-01-20 23:09:48 +00003249 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003250
Joanna Wang39811b12023-01-20 23:09:48 +00003251 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003252 for match in matches:
3253 if not match:
3254 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003255 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003256
Joanna Wang39811b12023-01-20 23:09:48 +00003257 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003258
3259 # Put the new lines in the description where the old first R= line was.
3260 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3261 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003262 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003263 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003264 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003265
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003266 def set_preserve_tryjobs(self):
3267 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3268 footers = git_footers.parse_footers(self.description)
3269 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3270 if v.lower() == 'true':
3271 return
3272 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3273
Anthony Polito8b955342019-09-24 19:01:36 +00003274 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003275 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003276 self.set_description([
3277 '# Enter a description of the change.',
3278 '# This will be displayed on the codereview site.',
3279 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003280 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003281 '--------------------',
3282 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003283 bug_regexp = re.compile(self.BUG_LINE)
3284 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003285 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003286 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003287
Dan Beamd8b04ca2019-10-10 21:23:26 +00003288 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003289 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003290
Bruce Dawsonfc487042020-10-27 19:11:37 +00003291 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003292 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003293 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003294 if not content:
3295 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003296 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003297
Bruce Dawson2377b012018-01-11 16:46:49 -08003298 # Strip off comments and default inserted "Bug:" line.
3299 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003300 (line.startswith('#') or
3301 line.rstrip() == "Bug:" or
3302 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003303 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003304 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003305 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003306
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003307 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003308 """Adds a footer line to the description.
3309
3310 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3311 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3312 that Gerrit footers are always at the end.
3313 """
3314 parsed_footer_line = git_footers.parse_footer(line)
3315 if parsed_footer_line:
3316 # Line is a gerrit footer in the form: Footer-Key: any value.
3317 # Thus, must be appended observing Gerrit footer rules.
3318 self.set_description(
3319 git_footers.add_footer(self.description,
3320 key=parsed_footer_line[0],
3321 value=parsed_footer_line[1]))
3322 return
3323
3324 if not self._description_lines:
3325 self._description_lines.append(line)
3326 return
3327
3328 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3329 if gerrit_footers:
3330 # git_footers.split_footers ensures that there is an empty line before
3331 # actual (gerrit) footers, if any. We have to keep it that way.
3332 assert top_lines and top_lines[-1] == ''
3333 top_lines, separator = top_lines[:-1], top_lines[-1:]
3334 else:
3335 separator = [] # No need for separator if there are no gerrit_footers.
3336
3337 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003338 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3339 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003340 top_lines.append('')
3341 top_lines.append(line)
3342 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003343
tandrii99a72f22016-08-17 14:33:24 -07003344 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003345 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003346 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003347 reviewers = [match.group(2).strip()
3348 for match in matches
3349 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003350 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003351
bradnelsond975b302016-10-23 12:20:23 -07003352 def get_cced(self):
3353 """Retrieves the list of reviewers."""
3354 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3355 cced = [match.group(2).strip() for match in matches if match]
3356 return cleanup_list(cced)
3357
Nodir Turakulov23b82142017-11-16 11:04:25 -08003358 def get_hash_tags(self):
3359 """Extracts and sanitizes a list of Gerrit hashtags."""
3360 subject = (self._description_lines or ('',))[0]
3361 subject = re.sub(
3362 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3363
3364 tags = []
3365 start = 0
3366 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3367 while True:
3368 m = bracket_exp.match(subject, start)
3369 if not m:
3370 break
3371 tags.append(self.sanitize_hash_tag(m.group(1)))
3372 start = m.end()
3373
3374 if not tags:
3375 # Try "Tag: " prefix.
3376 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3377 if m:
3378 tags.append(self.sanitize_hash_tag(m.group(1)))
3379 return tags
3380
3381 @classmethod
3382 def sanitize_hash_tag(cls, tag):
3383 """Returns a sanitized Gerrit hash tag.
3384
3385 A sanitized hashtag can be used as a git push refspec parameter value.
3386 """
3387 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3388
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003389
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003390def FindCodereviewSettingsFile(filename='codereview.settings'):
3391 """Finds the given file starting in the cwd and going up.
3392
3393 Only looks up to the top of the repository unless an
3394 'inherit-review-settings-ok' file exists in the root of the repository.
3395 """
3396 inherit_ok_file = 'inherit-review-settings-ok'
3397 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003398 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003399 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003400 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003401 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003402 if os.path.isfile(os.path.join(cwd, filename)):
3403 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003404 if cwd == root:
3405 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003406 parent_dir = os.path.dirname(cwd)
3407 if parent_dir == cwd:
3408 # We hit the system root directory.
3409 break
3410 cwd = parent_dir
3411 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003412
3413
3414def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003415 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003416 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003417
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003418 def SetProperty(name, setting, unset_error_ok=False):
3419 fullname = 'rietveld.' + name
3420 if setting in keyvals:
3421 RunGit(['config', fullname, keyvals[setting]])
3422 else:
3423 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3424
tandrii48df5812016-10-17 03:55:37 -07003425 if not keyvals.get('GERRIT_HOST', False):
3426 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003427 # Only server setting is required. Other settings can be absent.
3428 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003429 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003430 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3431 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003432 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003433 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3434 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003435 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3436 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003437 SetProperty(
3438 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003439 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003440
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003441 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003442 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003443
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003444 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003445 RunGit(['config', 'gerrit.squash-uploads',
3446 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003447
tandrii@chromium.org28253532016-04-14 13:46:56 +00003448 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003449 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003450 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3451
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003452 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003453 # should be of the form
3454 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3455 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3457 keyvals['ORIGIN_URL_CONFIG']])
3458
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003459
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003460def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003461 """Downloads a network object to a local file, like urllib.urlretrieve.
3462
3463 This is necessary because urllib is broken for SSL connections via a proxy.
3464 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003465 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003466 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003467
3468
ukai@chromium.org712d6102013-11-27 00:52:58 +00003469def hasSheBang(fname):
3470 """Checks fname is a #! script."""
3471 with open(fname) as f:
3472 return f.read(2).startswith('#!')
3473
3474
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003475def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003476 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003477
3478 Args:
3479 force: True to update hooks. False to install hooks if not present.
3480 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003481 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003482 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3483 if not os.access(dst, os.X_OK):
3484 if os.path.exists(dst):
3485 if not force:
3486 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003487 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003488 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003489 if not hasSheBang(dst):
3490 DieWithError('Not a script: %s\n'
3491 'You need to download from\n%s\n'
3492 'into .git/hooks/commit-msg and '
3493 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003494 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3495 except Exception:
3496 if os.path.exists(dst):
3497 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003498 DieWithError('\nFailed to download hooks.\n'
3499 'You need to download from\n%s\n'
3500 'into .git/hooks/commit-msg and '
3501 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003502
3503
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003504class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003505 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003507 def __init__(self):
3508 # Cached list of [host, identity, source], where source is either
3509 # .gitcookies or .netrc.
3510 self._all_hosts = None
3511
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003512 def ensure_configured_gitcookies(self):
3513 """Runs checks and suggests fixes to make git use .gitcookies from default
3514 path."""
3515 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3516 configured_path = RunGitSilent(
3517 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003518 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003519 if configured_path:
3520 self._ensure_default_gitcookies_path(configured_path, default)
3521 else:
3522 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003524 @staticmethod
3525 def _ensure_default_gitcookies_path(configured_path, default_path):
3526 assert configured_path
3527 if configured_path == default_path:
3528 print('git is already configured to use your .gitcookies from %s' %
3529 configured_path)
3530 return
3531
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003532 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003533 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3534 (configured_path, default_path))
3535
3536 if not os.path.exists(configured_path):
3537 print('However, your configured .gitcookies file is missing.')
3538 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3539 action='reconfigure')
3540 RunGit(['config', '--global', 'http.cookiefile', default_path])
3541 return
3542
3543 if os.path.exists(default_path):
3544 print('WARNING: default .gitcookies file already exists %s' %
3545 default_path)
3546 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3547 default_path)
3548
3549 confirm_or_exit('Move existing .gitcookies to default location?',
3550 action='move')
3551 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003552 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003553 print('Moved and reconfigured git to use .gitcookies from %s' %
3554 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003555
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003556 @staticmethod
3557 def _configure_gitcookies_path(default_path):
3558 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3559 if os.path.exists(netrc_path):
3560 print('You seem to be using outdated .netrc for git credentials: %s' %
3561 netrc_path)
3562 print('This tool will guide you through setting up recommended '
3563 '.gitcookies store for git credentials.\n'
3564 '\n'
3565 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3566 ' git config --global --unset http.cookiefile\n'
3567 ' mv %s %s.backup\n\n' % (default_path, default_path))
3568 confirm_or_exit(action='setup .gitcookies')
3569 RunGit(['config', '--global', 'http.cookiefile', default_path])
3570 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003571
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003572 def get_hosts_with_creds(self, include_netrc=False):
3573 if self._all_hosts is None:
3574 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003575 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3576 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3577 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3578 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003579
3580 if include_netrc:
3581 return self._all_hosts
3582 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3583
3584 def print_current_creds(self, include_netrc=False):
3585 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3586 if not hosts:
3587 print('No Git/Gerrit credentials found')
3588 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003589 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003590 header = [('Host', 'User', 'Which file'),
3591 ['=' * l for l in lengths]]
3592 for row in (header + hosts):
3593 print('\t'.join((('%%+%ds' % l) % s)
3594 for l, s in zip(lengths, row)))
3595
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003596 @staticmethod
3597 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003598 """Parses identity "git-<username>.domain" into <username> and domain."""
3599 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003600 # distinguishable from sub-domains. But we do know typical domains:
3601 if identity.endswith('.chromium.org'):
3602 domain = 'chromium.org'
3603 username = identity[:-len('.chromium.org')]
3604 else:
3605 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003606 if username.startswith('git-'):
3607 username = username[len('git-'):]
3608 return username, domain
3609
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003610 def has_generic_host(self):
3611 """Returns whether generic .googlesource.com has been configured.
3612
3613 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3614 """
3615 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003616 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003617 return True
3618 return False
3619
3620 def _get_git_gerrit_identity_pairs(self):
3621 """Returns map from canonic host to pair of identities (Git, Gerrit).
3622
3623 One of identities might be None, meaning not configured.
3624 """
3625 host_to_identity_pairs = {}
3626 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003627 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003628 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3629 idx = 0 if canonical == host else 1
3630 pair[idx] = identity
3631 return host_to_identity_pairs
3632
3633 def get_partially_configured_hosts(self):
3634 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003635 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003636 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003637 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003638
3639 def get_conflicting_hosts(self):
3640 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003642 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003643 if None not in (i1, i2) and i1 != i2)
3644
3645 def get_duplicated_hosts(self):
3646 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003647 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003648
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003649
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003650 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003651 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003652 hosts = sorted(hosts)
3653 assert hosts
3654 if extra_column_func is None:
3655 extras = [''] * len(hosts)
3656 else:
3657 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003658 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3659 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003660 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003661 lines.append(tmpl % he)
3662 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003663
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003664 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003665 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003666 yield ('.googlesource.com wildcard record detected',
3667 ['Chrome Infrastructure team recommends to list full host names '
3668 'explicitly.'],
3669 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003670
3671 dups = self.get_duplicated_hosts()
3672 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003673 yield ('The following hosts were defined twice',
3674 self._format_hosts(dups),
3675 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003676
3677 partial = self.get_partially_configured_hosts()
3678 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003679 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3680 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003681 self._format_hosts(
3682 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3683 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003684
3685 conflicting = self.get_conflicting_hosts()
3686 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003687 yield ('The following Git hosts have differing credentials from their '
3688 'Gerrit counterparts',
3689 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3690 tuple(self._get_git_gerrit_identity_pairs()[host])),
3691 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003692
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003693 def find_and_report_problems(self):
3694 """Returns True if there was at least one problem, else False."""
3695 found = False
3696 bad_hosts = set()
3697 for title, sublines, hosts in self._find_problems():
3698 if not found:
3699 found = True
3700 print('\n\n.gitcookies problem report:\n')
3701 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003702 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003703 if sublines:
3704 print()
3705 print(' %s' % '\n '.join(sublines))
3706 print()
3707
3708 if bad_hosts:
3709 assert found
3710 print(' You can manually remove corresponding lines in your %s file and '
3711 'visit the following URLs with correct account to generate '
3712 'correct credential lines:\n' %
3713 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003714 print(' %s' % '\n '.join(
3715 sorted(
3716 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3717 _canonical_git_googlesource_host(host))
3718 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003719 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003720
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003721
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003722@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003723def CMDcreds_check(parser, args):
3724 """Checks credentials and suggests changes."""
3725 _, _ = parser.parse_args(args)
3726
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003727 # Code below checks .gitcookies. Abort if using something else.
3728 authn = gerrit_util.Authenticator.get()
3729 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003730 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003731 'This command is not designed for bot environment. It checks '
3732 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003733 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3734 if isinstance(authn, gerrit_util.GceAuthenticator):
3735 message += (
3736 '\n'
3737 'If you need to run this on GCE or a cloudtop instance, '
3738 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3739 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003740
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003741 checker = _GitCookiesChecker()
3742 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003743
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003744 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003745 checker.print_current_creds(include_netrc=True)
3746
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003747 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003748 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003749 return 0
3750 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003751
3752
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003753@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003754def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003755 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003756 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003757 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003758 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003759 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003760 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003761 return RunGit(['config', 'branch.%s.base-url' % branch],
3762 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003763
3764 print('Setting base-url to %s' % args[0])
3765 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3766 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003767
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003768
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003769def color_for_status(status):
3770 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003771 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003772 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003773 'unsent': BOLD + Fore.YELLOW,
3774 'waiting': BOLD + Fore.RED,
3775 'reply': BOLD + Fore.YELLOW,
3776 'not lgtm': BOLD + Fore.RED,
3777 'lgtm': BOLD + Fore.GREEN,
3778 'commit': BOLD + Fore.MAGENTA,
3779 'closed': BOLD + Fore.CYAN,
3780 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003781 }.get(status, Fore.WHITE)
3782
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003783
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003784def get_cl_statuses(changes, fine_grained, max_processes=None):
3785 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003786
3787 If fine_grained is true, this will fetch CL statuses from the server.
3788 Otherwise, simply indicate if there's a matching url for the given branches.
3789
3790 If max_processes is specified, it is used as the maximum number of processes
3791 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3792 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003793
3794 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003795 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003796 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003797 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003798
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003799 if not fine_grained:
3800 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003801 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003802 for cl in changes:
3803 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003804 return
3805
3806 # First, sort out authentication issues.
3807 logging.debug('ensuring credentials exist')
3808 for cl in changes:
3809 cl.EnsureAuthenticated(force=False, refresh=True)
3810
3811 def fetch(cl):
3812 try:
3813 return (cl, cl.GetStatus())
3814 except:
3815 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003816 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003817 raise
3818
3819 threads_count = len(changes)
3820 if max_processes:
3821 threads_count = max(1, min(threads_count, max_processes))
3822 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3823
Edward Lemur61bf4172020-02-24 23:22:37 +00003824 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003825 fetched_cls = set()
3826 try:
3827 it = pool.imap_unordered(fetch, changes).__iter__()
3828 while True:
3829 try:
3830 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003831 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003832 break
3833 fetched_cls.add(cl)
3834 yield cl, status
3835 finally:
3836 pool.close()
3837
3838 # Add any branches that failed to fetch.
3839 for cl in set(changes) - fetched_cls:
3840 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003841
rmistry@google.com2dd99862015-06-22 12:22:18 +00003842
Jose Lopes3863fc52020-04-07 17:00:25 +00003843def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844 """Uploads CLs of local branches that are dependents of the current branch.
3845
3846 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003847
3848 test1 -> test2.1 -> test3.1
3849 -> test3.2
3850 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003851
3852 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3853 run on the dependent branches in this order:
3854 test2.1, test3.1, test3.2, test2.2, test3.3
3855
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003856 Note: This function does not rebase your local dependent branches. Use it
3857 when you make a change to the parent branch that will not conflict
3858 with its dependent branches, and you would like their dependencies
3859 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003860 """
3861 if git_common.is_dirty_git_tree('upload-branch-deps'):
3862 return 1
3863
3864 root_branch = cl.GetBranch()
3865 if root_branch is None:
3866 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3867 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003868 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003869 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3870 'patchset dependencies without an uploaded CL.')
3871
3872 branches = RunGit(['for-each-ref',
3873 '--format=%(refname:short) %(upstream:short)',
3874 'refs/heads'])
3875 if not branches:
3876 print('No local branches found.')
3877 return 0
3878
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003879 # Create a dictionary of all local branches to the branches that are
3880 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003881 tracked_to_dependents = collections.defaultdict(list)
3882 for b in branches.splitlines():
3883 tokens = b.split()
3884 if len(tokens) == 2:
3885 branch_name, tracked = tokens
3886 tracked_to_dependents[tracked].append(branch_name)
3887
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print()
3889 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003891
rmistry@google.com2dd99862015-06-22 12:22:18 +00003892 def traverse_dependents_preorder(branch, padding=''):
3893 dependents_to_process = tracked_to_dependents.get(branch, [])
3894 padding += ' '
3895 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003897 dependents.append(dependent)
3898 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003899
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003901 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003902
3903 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003904 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905 return 0
3906
rmistry@google.com2dd99862015-06-22 12:22:18 +00003907 # Record all dependents that failed to upload.
3908 failures = {}
3909 # Go through all dependents, checkout the branch and upload.
3910 try:
3911 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003912 print()
3913 print('--------------------------------------')
3914 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003915 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003916 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003917 try:
3918 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003919 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003920 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003921 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003922 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003923 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003924 finally:
3925 # Swap back to the original root branch.
3926 RunGit(['checkout', '-q', root_branch])
3927
vapiera7fbd5a2016-06-16 09:17:49 -07003928 print()
3929 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003930 for dependent_branch in dependents:
3931 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003932 print(' %s : %s' % (dependent_branch, upload_status))
3933 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003934
3935 return 0
3936
3937
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003938def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003939 """Given a proposed tag name, returns a tag name that is guaranteed to be
3940 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3941 or 'foo-3', and so on."""
3942
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003943 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003944 for suffix_num in itertools.count(1):
3945 if suffix_num == 1:
3946 to_check = proposed_tag
3947 else:
3948 to_check = '%s-%d' % (proposed_tag, suffix_num)
3949
3950 if to_check not in existing_tags:
3951 return to_check
3952
3953
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003954@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003955def CMDarchive(parser, args):
3956 """Archives and deletes branches associated with closed changelists."""
3957 parser.add_option(
3958 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003959 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003960 parser.add_option(
3961 '-f', '--force', action='store_true',
3962 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003963 parser.add_option(
3964 '-d', '--dry-run', action='store_true',
3965 help='Skip the branch tagging and removal steps.')
3966 parser.add_option(
3967 '-t', '--notags', action='store_true',
3968 help='Do not tag archived branches. '
3969 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003970 parser.add_option(
3971 '-p',
3972 '--pattern',
3973 default='git-cl-archived-{issue}-{branch}',
3974 help='Format string for archive tags. '
3975 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003976
kmarshall3bff56b2016-06-06 18:31:47 -07003977 options, args = parser.parse_args(args)
3978 if args:
3979 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003980
3981 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3982 if not branches:
3983 return 0
3984
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003985 tags = RunGit(['for-each-ref', '--format=%(refname)',
3986 'refs/tags']).splitlines() or []
3987 tags = [t.split('/')[-1] for t in tags]
3988
vapiera7fbd5a2016-06-16 09:17:49 -07003989 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003990 changes = [Changelist(branchref=b)
3991 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003992 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3993 statuses = get_cl_statuses(changes,
3994 fine_grained=True,
3995 max_processes=options.maxjobs)
3996 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003997 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3998 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003999 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004000 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004001 proposal.sort()
4002
4003 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004004 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004005 return 0
4006
Edward Lemur85153282020-02-14 22:06:29 +00004007 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07004008
vapiera7fbd5a2016-06-16 09:17:49 -07004009 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004010 if options.notags:
4011 for next_item in proposal:
4012 print(' ' + next_item[0])
4013 else:
4014 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4015 for next_item in proposal:
4016 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004017
kmarshall9249e012016-08-23 12:02:16 -07004018 # Quit now on precondition failure or if instructed by the user, either
4019 # via an interactive prompt or by command line flags.
4020 if options.dry_run:
4021 print('\nNo changes were made (dry run).\n')
4022 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004023
4024 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004025 print('You are currently on a branch \'%s\' which is associated with a '
4026 'closed codereview issue, so archive cannot proceed. Please '
4027 'checkout another branch and run this command again.' %
4028 current_branch)
4029 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004030
4031 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004032 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004033 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004034 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004035 return 1
4036
4037 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004038 if not options.notags:
4039 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004040
4041 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4042 # Clean up the tag if we failed to delete the branch.
4043 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004044
vapiera7fbd5a2016-06-16 09:17:49 -07004045 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004046
4047 return 0
4048
4049
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004050@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004052 """Show status of changelists.
4053
4054 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004055 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004056 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004057 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004058 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004059 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004060 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004061 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004062
4063 Also see 'git cl comments'.
4064 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004065 parser.add_option(
4066 '--no-branch-color',
4067 action='store_true',
4068 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004069 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004070 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004071 parser.add_option('-f', '--fast', action='store_true',
4072 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004073 parser.add_option(
4074 '-j', '--maxjobs', action='store', type=int,
4075 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004076 parser.add_option(
4077 '-i', '--issue', type=int,
4078 help='Operate on this issue instead of the current branch\'s implicit '
4079 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004080 parser.add_option('-d',
4081 '--date-order',
4082 action='store_true',
4083 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004084 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004085 if args:
4086 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004087
iannuccie53c9352016-08-17 14:40:40 -07004088 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004089 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004090
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004091 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004092 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004093 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004094 if cl.GetIssue():
4095 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004096 elif options.field == 'id':
4097 issueid = cl.GetIssue()
4098 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004099 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004100 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004101 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004102 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004103 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004104 elif options.field == 'status':
4105 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004106 elif options.field == 'url':
4107 url = cl.GetIssueURL()
4108 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004110 return 0
4111
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004112 branches = RunGit([
4113 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4114 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004115 if not branches:
4116 print('No local branch found.')
4117 return 0
4118
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004119 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004120 Changelist(branchref=b, commit_date=ct)
4121 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4122 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004123 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004124 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004126 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004127
Edward Lemur85153282020-02-14 22:06:29 +00004128 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004129
4130 def FormatBranchName(branch, colorize=False):
4131 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4132 an asterisk when it is the current branch."""
4133
4134 asterisk = ""
4135 color = Fore.RESET
4136 if branch == current_branch:
4137 asterisk = "* "
4138 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004139 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004140
4141 if colorize:
4142 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004143 return asterisk + branch_name
4144
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004145 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004146
4147 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004148
4149 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004150 sorted_changes = sorted(changes,
4151 key=lambda c: c.GetCommitDate(),
4152 reverse=True)
4153 else:
4154 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4155 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004156 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004157 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004158 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004159 branch_statuses[c.GetBranch()] = status
4160 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004161 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004162 if url and (not status or status == 'error'):
4163 # The issue probably doesn't exist anymore.
4164 url += ' (broken)'
4165
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004166 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004167 # Turn off bold as well as colors.
4168 END = '\033[0m'
4169 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004170 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004171 color = ''
4172 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004173 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004174
Alan Cuttera3be9a52019-03-04 18:50:33 +00004175 branch_display = FormatBranchName(branch)
4176 padding = ' ' * (alignment - len(branch_display))
4177 if not options.no_branch_color:
4178 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004179
Alan Cuttera3be9a52019-03-04 18:50:33 +00004180 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4181 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004182
vapiera7fbd5a2016-06-16 09:17:49 -07004183 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004184 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004185 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004186 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004187 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004188 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004190 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004191 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004192 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004193 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004194 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004195 return 0
4196
4197
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004198def colorize_CMDstatus_doc():
4199 """To be called once in main() to add colors to git cl status help."""
4200 colors = [i for i in dir(Fore) if i[0].isupper()]
4201
4202 def colorize_line(line):
4203 for color in colors:
4204 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004205 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004206 indent = len(line) - len(line.lstrip(' ')) + 1
4207 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4208 return line
4209
4210 lines = CMDstatus.__doc__.splitlines()
4211 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4212
4213
phajdan.jre328cf92016-08-22 04:12:17 -07004214def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004215 if path == '-':
4216 json.dump(contents, sys.stdout)
4217 else:
4218 with open(path, 'w') as f:
4219 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004220
4221
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004222@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004223@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004224def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004225 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004226
4227 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004228 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004229 parser.add_option('-r', '--reverse', action='store_true',
4230 help='Lookup the branch(es) for the specified issues. If '
4231 'no issues are specified, all branches with mapped '
4232 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004233 parser.add_option('--json',
4234 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004235 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004236
dnj@chromium.org406c4402015-03-03 17:22:28 +00004237 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004238 branches = RunGit(['for-each-ref', 'refs/heads',
4239 '--format=%(refname)']).splitlines()
4240 # Reverse issue lookup.
4241 issue_branch_map = {}
4242
4243 git_config = {}
4244 for config in RunGit(['config', '--get-regexp',
4245 r'branch\..*issue']).splitlines():
4246 name, _space, val = config.partition(' ')
4247 git_config[name] = val
4248
4249 for branch in branches:
4250 issue = git_config.get(
4251 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4252 if issue:
4253 issue_branch_map.setdefault(int(issue), []).append(branch)
4254 if not args:
4255 args = sorted(issue_branch_map.keys())
4256 result = {}
4257 for issue in args:
4258 try:
4259 issue_num = int(issue)
4260 except ValueError:
4261 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4262 continue
4263 result[issue_num] = issue_branch_map.get(issue_num)
4264 print('Branch for issue number %s: %s' %
4265 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4266 if options.json:
4267 write_json(options.json, result)
4268 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004269
4270 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004271 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004272 if not issue.valid:
4273 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4274 'or no argument to list it.\n'
4275 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004276 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004277 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004278 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004279 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004280 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4281 if options.json:
4282 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004283 'gerrit_host': cl.GetGerritHost(),
4284 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004285 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004286 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004287 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004288 return 0
4289
4290
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004291@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004292def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004293 """Shows or posts review comments for any changelist."""
4294 parser.add_option('-a', '--add-comment', dest='comment',
4295 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004296 parser.add_option('-p', '--publish', action='store_true',
4297 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004298 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004299 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004300 parser.add_option('-m', '--machine-readable', dest='readable',
4301 action='store_false', default=True,
4302 help='output comments in a format compatible with '
4303 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004304 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004305 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004306 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004307
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004308 issue = None
4309 if options.issue:
4310 try:
4311 issue = int(options.issue)
4312 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004313 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004314
Edward Lemur934836a2019-09-09 20:16:54 +00004315 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004316
4317 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004318 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004319 return 0
4320
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004321 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4322 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004323 for comment in summary:
4324 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004325 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004326 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004327 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004328 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004329 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004330 elif comment.autogenerated:
4331 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004332 else:
4333 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004334 print('\n%s%s %s%s\n%s' % (
4335 color,
4336 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4337 comment.sender,
4338 Fore.RESET,
4339 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4340
smut@google.comc85ac942015-09-15 16:34:43 +00004341 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004342 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004343 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004344 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4345 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004346 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004347 return 0
4348
4349
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004350@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004351@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004352def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004353 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004354 parser.add_option('-d', '--display', action='store_true',
4355 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004356 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004357 help='New description to set for this issue (- for stdin, '
4358 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004359 parser.add_option('-f', '--force', action='store_true',
4360 help='Delete any unpublished Gerrit edits for this issue '
4361 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004362
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004363 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004364
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004365 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004366 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004367 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004368 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004369 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004370
Edward Lemur934836a2019-09-09 20:16:54 +00004371 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004372 if target_issue_arg:
4373 kwargs['issue'] = target_issue_arg.issue
4374 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004375
4376 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004377 if not cl.GetIssue():
4378 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004379
Edward Lemur678a6842019-10-03 22:25:05 +00004380 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004381 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004382
Edward Lemur6c6827c2020-02-06 21:15:18 +00004383 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004384
smut@google.com34fb6b12015-07-13 20:03:26 +00004385 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004387 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004388
4389 if options.new_description:
4390 text = options.new_description
4391 if text == '-':
4392 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004393 elif text == '+':
4394 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004395 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004396
4397 description.set_description(text)
4398 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004399 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004400 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004401 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004402 return 0
4403
4404
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004405@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004406def CMDlint(parser, args):
4407 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004408 parser.add_option('--filter', action='append', metavar='-x,+y',
4409 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004410 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004411
4412 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004413 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004414 try:
4415 import cpplint
4416 import cpplint_chromium
4417 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004418 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004419 return 1
4420
4421 # Change the current working directory before calling lint so that it
4422 # shows the correct base.
4423 previous_cwd = os.getcwd()
4424 os.chdir(settings.GetRoot())
4425 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004426 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004427 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004428 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004429 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004430 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004431
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004432 # Process cpplint arguments, if any.
4433 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4434 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004435 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004436
Lei Zhang379d1ad2020-07-15 19:40:06 +00004437 include_regex = re.compile(settings.GetLintRegex())
4438 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004439 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4440 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004441 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004442 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004443 continue
4444
4445 if ignore_regex.match(filename):
4446 print('Ignoring file %s' % filename)
4447 continue
4448
4449 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4450 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004451 finally:
4452 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004453 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004454 if cpplint._cpplint_state.error_count != 0:
4455 return 1
4456 return 0
4457
4458
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004459@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004460def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004461 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004462 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004463 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004464 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004465 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004466 parser.add_option('--all', action='store_true',
4467 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004468 parser.add_option('--files',
4469 nargs=1,
4470 help='Semicolon-separated list of files to be marked as '
4471 'modified when executing presubmit or post-upload hooks. '
4472 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004473 parser.add_option('--parallel', action='store_true',
4474 help='Run all tests specified by input_api.RunTests in all '
4475 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004476 parser.add_option('--resultdb', action='store_true',
4477 help='Run presubmit checks in the ResultSink environment '
4478 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004479 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004480 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004481
sbc@chromium.org71437c02015-04-09 19:29:40 +00004482 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004483 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004484 return 1
4485
Edward Lemur934836a2019-09-09 20:16:54 +00004486 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487 if args:
4488 base_branch = args[0]
4489 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004490 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004491 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004492
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004493 start = time.time()
4494 try:
4495 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4496 description = cl.FetchDescription()
4497 else:
4498 description = _create_description_from_log([base_branch])
4499 except Exception as e:
4500 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004501 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004502 elapsed = time.time() - start
4503 if elapsed > 5:
4504 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004505
Bruce Dawson13acea32022-05-03 22:13:08 +00004506 if not base_branch:
4507 if not options.force:
4508 print('use --force to check even when not on a branch.')
4509 return 1
4510 base_branch = 'HEAD'
4511
Josip Sokcevic017544d2022-03-31 23:47:53 +00004512 cl.RunHook(committing=not options.upload,
4513 may_prompt=False,
4514 verbose=options.verbose,
4515 parallel=options.parallel,
4516 upstream=base_branch,
4517 description=description,
4518 all_files=options.all,
4519 files=options.files,
4520 resultdb=options.resultdb,
4521 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004522 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523
4524
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004525def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004526 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004527
4528 Works the same way as
4529 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4530 but can be called on demand on all platforms.
4531
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004532 The basic idea is to generate git hash of a state of the tree, original
4533 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004534 """
4535 lines = []
4536 tree_hash = RunGitSilent(['write-tree'])
4537 lines.append('tree %s' % tree_hash.strip())
4538 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4539 if code == 0:
4540 lines.append('parent %s' % parent.strip())
4541 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4542 lines.append('author %s' % author.strip())
4543 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4544 lines.append('committer %s' % committer.strip())
4545 lines.append('')
4546 # Note: Gerrit's commit-hook actually cleans message of some lines and
4547 # whitespace. This code is not doing this, but it clearly won't decrease
4548 # entropy.
4549 lines.append(message)
4550 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004551 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004552 return 'I%s' % change_hash.strip()
4553
4554
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004555def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004556 """Computes the remote branch ref to use for the CL.
4557
4558 Args:
4559 remote (str): The git remote for the CL.
4560 remote_branch (str): The git remote branch for the CL.
4561 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004562 """
4563 if not (remote and remote_branch):
4564 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004565
wittman@chromium.org455dc922015-01-26 20:15:50 +00004566 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004567 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004568 # refs, which are then translated into the remote full symbolic refs
4569 # below.
4570 if '/' not in target_branch:
4571 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4572 else:
4573 prefix_replacements = (
4574 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4575 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4576 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4577 )
4578 match = None
4579 for regex, replacement in prefix_replacements:
4580 match = re.search(regex, target_branch)
4581 if match:
4582 remote_branch = target_branch.replace(match.group(0), replacement)
4583 break
4584 if not match:
4585 # This is a branch path but not one we recognize; use as-is.
4586 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004587 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004588 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004589 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004590 # Handle the refs that need to land in different refs.
4591 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004592
wittman@chromium.org455dc922015-01-26 20:15:50 +00004593 # Create the true path to the remote branch.
4594 # Does the following translation:
4595 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004596 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004597 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4598 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4599 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4600 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4601 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4602 'refs/heads/')
4603 elif remote_branch.startswith('refs/remotes/branch-heads'):
4604 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004605
wittman@chromium.org455dc922015-01-26 20:15:50 +00004606 return remote_branch
4607
4608
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004609def cleanup_list(l):
4610 """Fixes a list so that comma separated items are put as individual items.
4611
4612 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4613 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4614 """
4615 items = sum((i.split(',') for i in l), [])
4616 stripped_items = (i.strip() for i in items)
4617 return sorted(filter(None, stripped_items))
4618
4619
Aaron Gable4db38df2017-11-03 14:59:07 -07004620@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004621@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004622def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004623 """Uploads the current changelist to codereview.
4624
4625 Can skip dependency patchset uploads for a branch by running:
4626 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004627 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004628 git config --unset branch.branch_name.skip-deps-uploads
4629 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004630
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004631 If the name of the checked out branch starts with "bug-" or "fix-" followed
4632 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004633 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004634
4635 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004636 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004637 [git-cl] add support for hashtags
4638 Foo bar: implement foo
4639 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004640 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004641 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4642 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004643 parser.add_option('--bypass-watchlists', action='store_true',
4644 dest='bypass_watchlists',
4645 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004646 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004647 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004648 parser.add_option('--message', '-m', dest='message',
4649 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004650 parser.add_option('-b', '--bug',
4651 help='pre-populate the bug number(s) for this issue. '
4652 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004653 parser.add_option('--message-file', dest='message_file',
4654 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004655 parser.add_option('--title', '-t', dest='title',
4656 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004657 parser.add_option('-T', '--skip-title', action='store_true',
4658 dest='skip_title',
4659 help='Use the most recent commit message as the title of '
4660 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004661 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004662 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004663 help='reviewer email addresses')
4664 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004665 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004666 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004667 parser.add_option('--hashtag', dest='hashtags',
4668 action='append', default=[],
4669 help=('Gerrit hashtag for new CL; '
4670 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004671 parser.add_option('-s',
4672 '--send-mail',
4673 '--send-email',
4674 dest='send_mail',
4675 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004676 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004677 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004678 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004679 metavar='TARGET',
4680 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004681 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004682 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004683 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004684 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004685 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004686 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004687 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004688 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4689 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004690 parser.add_option('-c',
4691 '--use-commit-queue',
4692 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004693 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004694 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004695 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004696 parser.add_option('-d', '--cq-dry-run',
4697 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004698 help='Send the patchset to do a CQ dry run right after '
4699 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004700 parser.add_option(
4701 '-q',
4702 '--cq-quick-run',
4703 action='store_true',
4704 default=False,
4705 help='Send the patchset to do a CQ quick run right after '
4706 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4707 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004708 parser.add_option('--set-bot-commit', action='store_true',
4709 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004710 parser.add_option('--preserve-tryjobs', action='store_true',
4711 help='instruct the CQ to let tryjobs running even after '
4712 'new patchsets are uploaded instead of canceling '
4713 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004714 parser.add_option('--dependencies', action='store_true',
4715 help='Uploads CLs of all the local branches that depend on '
4716 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004717 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4718 help='Sends your change to the CQ after an approval. Only '
4719 'works on repos that have the Auto-Submit label '
4720 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004721 parser.add_option('--parallel', action='store_true',
4722 help='Run all tests specified by input_api.RunTests in all '
4723 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004724 parser.add_option('--no-autocc', action='store_true',
4725 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004726 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004727 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004728 parser.add_option('-R', '--retry-failed', action='store_true',
4729 help='Retry failed tryjobs from old patchset immediately '
4730 'after uploading new patchset. Cannot be used with '
4731 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004732 parser.add_option('--fixed', '-x',
4733 help='List of bugs that will be commented on and marked '
4734 'fixed (pre-populates "Fixed:" tag). Same format as '
4735 '-b option / "Bug:" tag. If fixing several issues, '
4736 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004737 parser.add_option('--edit-description', action='store_true', default=False,
4738 help='Modify description before upload. Cannot be used '
4739 'with --force. It is a noop when --no-squash is set '
4740 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004741 parser.add_option('--git-completion-helper', action="store_true",
4742 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004743 parser.add_option('-o',
4744 '--push-options',
4745 action='append',
4746 default=[],
4747 help='Transmit the given string to the server when '
4748 'performing git push (pass-through). See git-push '
4749 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004750 parser.add_option('--no-add-changeid',
4751 action='store_true',
4752 dest='no_add_changeid',
4753 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004754 parser.add_option('--no-python2-post-upload-hooks',
4755 action='store_true',
4756 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004757 parser.add_option('--cherry-pick-stacked',
4758 '--cp',
4759 dest='cherry_pick_stacked',
4760 action='store_true',
4761 help='If parent branch has un-uploaded updates, '
4762 'automatically skip parent branches and just upload '
4763 'the current branch cherry-pick on its parent\'s last '
4764 'uploaded commit. Allows users to skip the potential '
4765 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004766 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004767
rmistry@google.com2dd99862015-06-22 12:22:18 +00004768 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004769 (options, args) = parser.parse_args(args)
4770
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004771 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004772 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4773 if opt.help != optparse.SUPPRESS_HELP))
4774 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004775
sbc@chromium.org71437c02015-04-09 19:29:40 +00004776 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004777 return 1
4778
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004779 options.reviewers = cleanup_list(options.reviewers)
4780 options.cc = cleanup_list(options.cc)
4781
Josipe827b0f2020-01-30 00:07:20 +00004782 if options.edit_description and options.force:
4783 parser.error('Only one of --force and --edit-description allowed')
4784
tandriib80458a2016-06-23 12:20:07 -07004785 if options.message_file:
4786 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004787 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004788 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004789
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004790 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004791 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004792 options.use_commit_queue,
4793 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004794 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4795 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004796
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004797 if options.skip_title and options.title:
4798 parser.error('Only one of --title and --skip-title allowed.')
4799
Aaron Gableedbc4132017-09-11 13:22:28 -07004800 if options.use_commit_queue:
4801 options.send_mail = True
4802
Edward Lesmes0dd54822020-03-26 18:24:25 +00004803 if options.squash is None:
4804 # Load default for user, repo, squash=true, in this order.
4805 options.squash = settings.GetSquashGerritUploads()
4806
Joanna Wang5051ffe2023-03-01 22:24:07 +00004807 cl = Changelist(branchref=options.target_branch)
4808
4809 # Warm change details cache now to avoid RPCs later, reducing latency for
4810 # developers.
4811 if cl.GetIssue():
4812 cl._GetChangeDetail(
4813 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4814
4815 if options.retry_failed and not cl.GetIssue():
4816 print('No previous patchsets, so --retry-failed has no effect.')
4817 options.retry_failed = False
4818
4819 remote = cl.GetRemoteUrl()
Joanna Wang892f2ce2023-03-14 21:39:47 +00004820 dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR)
Joanna Wang5051ffe2023-03-01 22:24:07 +00004821 not in ['1', '0']
4822 and any(repo in remote
4823 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4824
4825 if dogfood_stacked_changes:
4826 print('This repo has been enrolled in the stacked changes dogfood. '
4827 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4828 'File bugs at https://bit.ly/3Y6opoI')
4829
4830 if options.squash and (dogfood_stacked_changes
Joanna Wang892f2ce2023-03-14 21:39:47 +00004831 or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'):
Brian Ryner8d19d862023-04-12 13:32:49 +00004832 print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4833 '"Set new changes to "work in progress" by default" checkbox at\n'
Joanna Wangd3cbd402023-04-10 16:51:57 +00004834 'https://<host>-review.googlesource.com/settings/')
Joanna Wangdd12deb2023-01-26 20:43:28 +00004835 if options.dependencies:
4836 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004837
Joanna Wangd75fc882023-03-01 21:53:34 +00004838 if options.cherry_pick_stacked:
4839 try:
4840 orig_args.remove('--cherry-pick-stacked')
4841 except ValueError:
4842 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004843 UploadAllSquashed(options, orig_args)
4844 return 0
4845
Joanna Wangd75fc882023-03-01 21:53:34 +00004846 if options.cherry_pick_stacked:
4847 parser.error('--cherry-pick-stacked is not available for this workflow.')
4848
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004849 # cl.GetMostRecentPatchset uses cached information, and can return the last
4850 # patchset before upload. Calling it here makes it clear that it's the
4851 # last patchset before upload. Note that GetMostRecentPatchset will fail
4852 # if no CL has been uploaded yet.
4853 if options.retry_failed:
4854 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004855
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004856 ret = cl.CMDUpload(options, args, orig_args)
4857
4858 if options.retry_failed:
4859 if ret != 0:
4860 print('Upload failed, so --retry-failed has no effect.')
4861 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004862 builds, _ = _fetch_latest_builds(cl,
4863 DEFAULT_BUILDBUCKET_HOST,
4864 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004865 jobs = _filter_failed_for_retry(builds)
4866 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004867 print('No failed tryjobs, so --retry-failed has no effect.')
4868 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004869 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004870
4871 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004872
4873
Joanna Wang18de1f62023-01-21 01:24:24 +00004874def UploadAllSquashed(options, orig_args):
4875 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4876 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004877 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004878
Joanna Wangc710e2d2023-01-25 14:53:22 +00004879 # Create commits.
4880 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4881 if cherry_pick_current:
4882 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4883 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4884 uploads_by_cl.append((cls[0], new_upload))
4885 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004886 ordered_cls = list(reversed(cls))
4887
Joanna Wang6215dd02023-02-07 15:58:03 +00004888 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004889 # We can only support external changes when we're only uploading one
4890 # branch.
4891 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004892 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004893 if parent is None:
4894 origin = '.'
4895 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004896
Joanna Wang7603f042023-03-01 22:17:36 +00004897 while origin == '.':
4898 # Search for cl's closest ancestor with a gerrit hash.
4899 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4900 if origin == '.':
4901 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4902
4903 # Support the `git merge` and `git pull` workflow.
4904 if upstream_branch in ['master', 'main']:
4905 parent = cl.GetCommonAncestorWithUpstream()
4906 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004907 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4908 upstream_branch,
4909 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004910 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4911 upstream_branch,
4912 GERRIT_SQUASH_HASH_CONFIG_KEY)
4913 if parent:
4914 break
4915 branch = upstream_branch
4916 else:
4917 # Either the root of the tree is the cl's direct parent and the while
4918 # loop above only found empty branches between cl and the root of the
4919 # tree.
4920 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004921
Joanna Wang05b60342023-03-29 20:25:57 +00004922 if orig_parent is None:
4923 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004924 for i, cl in enumerate(ordered_cls):
4925 # If we're in the middle of the stack, set end_commit to downstream's
4926 # direct ancestor.
4927 if i + 1 < len(ordered_cls):
4928 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4929 else:
4930 child_base_commit = None
4931 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004932 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004933 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004934 end_commit=child_base_commit)
4935 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004936 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004937 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004938
4939 # Create refspec options
4940 cl, new_upload = uploads_by_cl[-1]
4941 refspec_opts = cl._GetRefSpecOptions(
4942 options,
4943 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004944 multi_change_upload=len(uploads_by_cl) > 1,
4945 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004946 refspec_suffix = ''
4947 if refspec_opts:
4948 refspec_suffix = '%' + ','.join(refspec_opts)
4949 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4950 refspec_suffix)
4951
4952 remote, remote_branch = cl.GetRemoteBranch()
4953 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4954 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4955 refspec_suffix)
4956
4957 # Git push
4958 git_push_metadata = {
4959 'gerrit_host':
4960 cl.GetGerritHost(),
4961 'title':
4962 options.title or '<untitled>',
4963 'change_id':
4964 git_footers.get_footer_change_id(new_upload.change_desc.description),
4965 'description':
4966 new_upload.change_desc.description,
4967 }
4968 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004969 git_push_metadata,
4970 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004971
4972 # Post push updates
4973 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4974 change_numbers = [
4975 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4976 ]
4977
4978 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4979 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4980
4981 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004982
4983
4984def _UploadAllPrecheck(options, orig_args):
4985 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4986 """Checks the state of the tree and gives the user uploading options
4987
4988 Returns: A tuple of the ordered list of changes that have new commits
4989 since their last upload and a boolean of whether the user wants to
4990 cherry-pick and upload the current branch instead of uploading all cls.
4991 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004992 cl = Changelist()
4993 if cl.GetBranch() is None:
4994 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4995
Joanna Wang18de1f62023-01-21 01:24:24 +00004996 branch_ref = None
4997 cls = []
4998 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004999 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005000
5001 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
5002
5003 while True:
5004 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
5005 DieWithError(
5006 'More than %s branches in the stack have not been uploaded.\n'
5007 'Are your branches in a misconfigured state?\n'
5008 'If not, please upload some upstream changes first.' %
5009 (_MAX_STACKED_BRANCHES_UPLOAD))
5010
5011 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005012
Joanna Wang6215dd02023-02-07 15:58:03 +00005013 # Only add CL if it has anything to commit.
5014 base_commit = cl.GetCommonAncestorWithUpstream()
5015 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5016
5017 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
5018 if diff:
5019 cls.append(cl)
5020 if (not first_pass and
5021 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5022 # We are mid-stack and the user must upload their upstream branches.
5023 must_upload_upstream = True
5024 elif first_pass: # The current branch has nothing to commit. Exit.
5025 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5026 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5027 first_pass = False
5028
5029 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 branch_ref = upstream_branch_ref # set branch for next run.
5032
Joanna Wang6215dd02023-02-07 15:58:03 +00005033 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5034 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5035 upstream_branch,
5036 LAST_UPLOAD_HASH_CONFIG_KEY)
5037
Joanna Wang18de1f62023-01-21 01:24:24 +00005038 # Case 1: We've reached the beginning of the tree.
5039 if origin != '.':
5040 break
5041
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005043 # the user MUST upload them unless they are empty. Continue to
5044 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005045 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005046 continue
5047
Joanna Wang18de1f62023-01-21 01:24:24 +00005048 # Case 3: If upstream's last_upload == cl.base_commit we do
5049 # not need to upload any more upstreams from this point on.
5050 # (Even if there may be diverged branches higher up the tree)
5051 if base_commit == upstream_last_upload:
5052 break
5053
5054 # Case 4: If upstream's last_upload < cl.base_commit we are
5055 # uploading cl and upstream_cl.
5056 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005057 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005058 continue
5059
5060 # Case 5: If cl.base_commit < upstream's last_upload the user
5061 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005062 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005063 DieWithError(
5064 'At least one branch in the stack has diverged from its upstream '
5065 'branch and does not contain its upstream\'s last upload.\n'
5066 'Please rebase the stack with `git rebase-update` before uploading.')
5067
5068 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5069 # any relation to commits in the tree. Continue up the tree until we hit
5070 # the root.
5071
5072 # We assume all cls in the stack have the same auth requirements and only
5073 # check this once.
5074 cls[0].EnsureAuthenticated(force=options.force)
5075
5076 cherry_pick = False
5077 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005078 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005079 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005080 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005081 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005082 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005083 msg = ('At least one parent branch in `%s` has never been uploaded '
5084 'and must be uploaded before/with `%s`.\n' %
5085 (branches, cls[1].branch))
5086 if options.cherry_pick_stacked:
5087 DieWithError(msg)
5088 if not options.force:
5089 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005090 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005091 if options.cherry_pick_stacked:
5092 print('cherry-picking `%s` on %s\'s last upload' %
5093 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005094 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005095 elif not options.force:
5096 answer = gclient_utils.AskForData(
5097 '\n' + opt_message +
5098 'Press enter to update branches %s.\nOr type `n` to upload only '
5099 '`%s` cherry-picked on %s\'s last upload:' %
5100 (branches, cls[0].branch, cls[1].branch))
5101 if answer.lower() == 'n':
5102 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005103 return cls, cherry_pick
5104
5105
Francois Dorayd42c6812017-05-30 15:10:20 -04005106@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005107@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005108def CMDsplit(parser, args):
5109 """Splits a branch into smaller branches and uploads CLs.
5110
5111 Creates a branch and uploads a CL for each group of files modified in the
5112 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005113 comment, the string '$directory', is replaced with the directory containing
5114 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005115 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005116 parser.add_option('-d', '--description', dest='description_file',
5117 help='A text file containing a CL description in which '
5118 '$directory will be replaced by each CL\'s directory.')
5119 parser.add_option('-c', '--comment', dest='comment_file',
5120 help='A text file containing a CL comment.')
5121 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005122 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005123 help='List the files and reviewers for each CL that would '
5124 'be created, but don\'t create branches or CLs.')
5125 parser.add_option('--cq-dry-run', action='store_true',
5126 help='If set, will do a cq dry run for each uploaded CL. '
5127 'Please be careful when doing this; more than ~10 CLs '
5128 'has the potential to overload our build '
5129 'infrastructure. Try to upload these not during high '
5130 'load times (usually 11-3 Mountain View time). Email '
5131 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005132 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5133 default=True,
5134 help='Sends your change to the CQ after an approval. Only '
5135 'works on repos that have the Auto-Submit label '
5136 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005137 parser.add_option('--max-depth',
5138 type='int',
5139 default=0,
5140 help='The max depth to look for OWNERS files. Useful for '
5141 'controlling the granularity of the split CLs, e.g. '
5142 '--max-depth=1 will only split by top-level '
5143 'directory. Specifying a value less than 1 means no '
5144 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005145 options, _ = parser.parse_args(args)
5146
5147 if not options.description_file:
5148 parser.error('No --description flag specified.')
5149
5150 def WrappedCMDupload(args):
5151 return CMDupload(OptionParser(), args)
5152
Daniel Cheng403c44e2022-10-05 22:24:58 +00005153 return split_cl.SplitCl(options.description_file, options.comment_file,
5154 Changelist, WrappedCMDupload, options.dry_run,
5155 options.cq_dry_run, options.enable_auto_submit,
5156 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005157
5158
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005159@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005160@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005161def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005162 """DEPRECATED: Used to commit the current changelist via git-svn."""
5163 message = ('git-cl no longer supports committing to SVN repositories via '
5164 'git-svn. You probably want to use `git cl land` instead.')
5165 print(message)
5166 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005167
5168
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005169@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005170@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005171def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 """Commits the current changelist via git.
5173
5174 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5175 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005176 """
5177 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5178 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005179 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005180 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005181 parser.add_option('--parallel', action='store_true',
5182 help='Run all tests specified by input_api.RunTests in all '
5183 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005184 parser.add_option('--resultdb', action='store_true',
5185 help='Run presubmit checks in the ResultSink environment '
5186 'and send results to the ResultDB database.')
5187 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005188 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005189
Edward Lemur934836a2019-09-09 20:16:54 +00005190 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005191
Robert Iannucci2e73d432018-03-14 01:10:47 -07005192 if not cl.GetIssue():
5193 DieWithError('You must upload the change first to Gerrit.\n'
5194 ' If you would rather have `git cl land` upload '
5195 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005196 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5197 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198
5199
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005200@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005201@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005202def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005203 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005204 parser.add_option('-b', dest='newbranch',
5205 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005206 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005207 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005209 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005210
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005211 group = optparse.OptionGroup(
5212 parser,
5213 'Options for continuing work on the current issue uploaded from a '
5214 'different clone (e.g. different machine). Must be used independently '
5215 'from the other options. No issue number should be specified, and the '
5216 'branch must have an issue number associated with it')
5217 group.add_option('--reapply', action='store_true', dest='reapply',
5218 help='Reset the branch and reapply the issue.\n'
5219 'CAUTION: This will undo any local changes in this '
5220 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005221
5222 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005223 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005224 parser.add_option_group(group)
5225
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005227
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005228 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005229 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005230 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005231 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005232 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005233
Edward Lemur934836a2019-09-09 20:16:54 +00005234 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005235 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005236 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005237
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005238 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005239 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005240 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005241
5242 RunGit(['reset', '--hard', upstream])
5243 if options.pull:
5244 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005245
Edward Lemur678a6842019-10-03 22:25:05 +00005246 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005247 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5248 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005249
5250 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005251 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005252
Edward Lemurf38bc172019-09-03 21:02:13 +00005253 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005254 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005255 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005256
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005257 # We don't want uncommitted changes mixed up with the patch.
5258 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005259 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005261 if options.newbranch:
5262 if options.force:
5263 RunGit(['branch', '-D', options.newbranch],
5264 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005265 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005266
Edward Lemur678a6842019-10-03 22:25:05 +00005267 cl = Changelist(
5268 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005269
Edward Lemur678a6842019-10-03 22:25:05 +00005270 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005271 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005272
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005273 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5274 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005275
5276
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005277def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005278 """Fetches the tree status and returns either 'open', 'closed',
5279 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005280 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005281 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005282 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 if status.find('closed') != -1 or status == '0':
5284 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005285
5286 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290 return 'unset'
5291
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005292
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293def GetTreeStatusReason():
5294 """Fetches the tree status from a json url and returns the message
5295 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005296 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005297 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005298 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299 status = json.loads(connection.read())
5300 connection.close()
5301 return status['message']
5302
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005303
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005304@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005305def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005306 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005307 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005308 status = GetTreeStatus()
5309 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005310 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005311 return 2
5312
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('The tree is %s' % status)
5314 print()
5315 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005316 if status != 'open':
5317 return 1
5318 return 0
5319
5320
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005321@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005322def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005323 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5324 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005325 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005326 '-b', '--bot', action='append',
5327 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5328 'times to specify multiple builders. ex: '
5329 '"-b win_rel -b win_layout". See '
5330 'the try server waterfall for the builders name and the tests '
5331 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005332 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005333 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005334 help=('Buildbucket bucket to send the try requests. Format: '
5335 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005336 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005337 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005338 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005339 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005340 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005341 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005342 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005343 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005344 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005345 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005346 '-q',
5347 '--quick-run',
5348 action='store_true',
5349 default=False,
5350 help='trigger in quick run mode '
5351 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5352 'uick_run.md) (chromium only).')
5353 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005354 '--category', default='git_cl_try', help='Specify custom build category.')
5355 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005356 '--project',
5357 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005358 'in recipe to determine to which repository or directory to '
5359 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005360 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005361 '-p', '--property', dest='properties', action='append', default=[],
5362 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005363 'key2=value2 etc. The value will be treated as '
5364 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005365 'NOTE: using this may make your tryjob not usable for CQ, '
5366 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005367 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005368 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5369 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005370 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005371 parser.add_option(
5372 '-R', '--retry-failed', action='store_true', default=False,
5373 help='Retry failed jobs from the latest set of tryjobs. '
5374 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005375 parser.add_option(
5376 '-i', '--issue', type=int,
5377 help='Operate on this issue instead of the current branch\'s implicit '
5378 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005379 options, args = parser.parse_args(args)
5380
machenbach@chromium.org45453142015-09-15 08:45:22 +00005381 # Make sure that all properties are prop=value pairs.
5382 bad_params = [x for x in options.properties if '=' not in x]
5383 if bad_params:
5384 parser.error('Got properties with missing "=": %s' % bad_params)
5385
maruel@chromium.org15192402012-09-06 12:38:29 +00005386 if args:
5387 parser.error('Unknown arguments: %s' % args)
5388
Edward Lemur934836a2019-09-09 20:16:54 +00005389 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005390 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005391 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005392
Edward Lemurf38bc172019-09-03 21:02:13 +00005393 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005394 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005395
tandriie113dfd2016-10-11 10:20:12 -07005396 error_message = cl.CannotTriggerTryJobReason()
5397 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005398 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005399
Edward Lemur45768512020-03-02 19:03:14 +00005400 if options.bot:
5401 if options.retry_failed:
5402 parser.error('--bot is not compatible with --retry-failed.')
5403 if not options.bucket:
5404 parser.error('A bucket (e.g. "chromium/try") is required.')
5405
5406 triggered = [b for b in options.bot if 'triggered' in b]
5407 if triggered:
5408 parser.error(
5409 'Cannot schedule builds on triggered bots: %s.\n'
5410 'This type of bot requires an initial job from a parent (usually a '
5411 'builder). Schedule a job on the parent instead.\n' % triggered)
5412
5413 if options.bucket.startswith('.master'):
5414 parser.error('Buildbot masters are not supported.')
5415
5416 project, bucket = _parse_bucket(options.bucket)
5417 if project is None or bucket is None:
5418 parser.error('Invalid bucket: %s.' % options.bucket)
5419 jobs = sorted((project, bucket, bot) for bot in options.bot)
5420 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005421 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005422 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005423 if options.verbose:
5424 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005425 jobs = _filter_failed_for_retry(builds)
5426 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005427 print('There are no failed jobs in the latest set of jobs '
5428 '(patchset #%d), doing nothing.' % patchset)
5429 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005430 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005431 if num_builders > 10:
5432 confirm_or_exit('There are %d builders with failed builds.'
5433 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005434 elif options.quick_run:
5435 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5436 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005437 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005438 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005439 print('git cl try with no bots now defaults to CQ dry run.')
5440 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5441 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005442
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005443 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005444 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005445 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005446 except BuildbucketResponseException as ex:
5447 print('ERROR: %s' % ex)
5448 return 1
5449 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005450
5451
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005452@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005453def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005454 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005455 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005456 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005457 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005458 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005459 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005460 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005461 '--color', action='store_true', default=setup_color.IS_TTY,
5462 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005463 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005464 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5465 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005466 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005467 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005468 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005469 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005470 parser.add_option(
5471 '-i', '--issue', type=int,
5472 help='Operate on this issue instead of the current branch\'s implicit '
5473 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005474 options, args = parser.parse_args(args)
5475 if args:
5476 parser.error('Unrecognized args: %s' % ' '.join(args))
5477
Edward Lemur934836a2019-09-09 20:16:54 +00005478 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005479 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005480 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005481
tandrii221ab252016-10-06 08:12:04 -07005482 patchset = options.patchset
5483 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005484 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005485 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005486 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005487 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005488 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005489 cl.GetIssue())
5490
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005491 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005492 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005493 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005494 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005495 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005496 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005497 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005498 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005499 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005500 return 0
5501
5502
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005503@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005504@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005505def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005506 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005507 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005508 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005509 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005510
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005511 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005512 if args:
5513 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005514 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005515 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005516 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005517 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005518
5519 # Clear configured merge-base, if there is one.
5520 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005521 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005522 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005523 return 0
5524
5525
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005526@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005527def CMDweb(parser, args):
5528 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005529 parser.add_option('-p',
5530 '--print-only',
5531 action='store_true',
5532 dest='print_only',
5533 help='Only print the Gerrit URL, don\'t open it in the '
5534 'browser.')
5535 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005536 if args:
5537 parser.error('Unrecognized args: %s' % ' '.join(args))
5538
5539 issue_url = Changelist().GetIssueURL()
5540 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005541 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005542 return 1
5543
Orr Bernstein0b960582022-12-22 20:16:18 +00005544 if options.print_only:
5545 print(issue_url)
5546 return 0
5547
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005548 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005549 # allows us to hide the "Created new window in existing browser session."
5550 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005551 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005552 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005553 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005554 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005555 os.open(os.devnull, os.O_RDWR)
5556 try:
5557 webbrowser.open(issue_url)
5558 finally:
5559 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005560 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005561 return 0
5562
5563
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005564@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005565def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005566 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005567 parser.add_option('-d', '--dry-run', action='store_true',
5568 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005569 parser.add_option(
5570 '-q',
5571 '--quick-run',
5572 action='store_true',
5573 help='trigger in quick run mode '
5574 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5575 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005576 parser.add_option('-c', '--clear', action='store_true',
5577 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005578 parser.add_option(
5579 '-i', '--issue', type=int,
5580 help='Operate on this issue instead of the current branch\'s implicit '
5581 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005582 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005583 if args:
5584 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005585 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5586 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005587
Edward Lemur934836a2019-09-09 20:16:54 +00005588 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005589 if not cl.GetIssue():
5590 parser.error('Must upload the issue first.')
5591
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005592 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005593 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005594 elif options.quick_run:
5595 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005596 elif options.dry_run:
5597 state = _CQState.DRY_RUN
5598 else:
5599 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005600 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005601 return 0
5602
5603
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005604@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005605def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005606 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005607 parser.add_option(
5608 '-i', '--issue', type=int,
5609 help='Operate on this issue instead of the current branch\'s implicit '
5610 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005611 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005612 if args:
5613 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005614 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005615 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005616 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005617 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005618 cl.CloseIssue()
5619 return 0
5620
5621
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005622@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005623def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005624 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005625 parser.add_option(
5626 '--stat',
5627 action='store_true',
5628 dest='stat',
5629 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005630 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005631 if args:
5632 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005633
Edward Lemur934836a2019-09-09 20:16:54 +00005634 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005635 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005636 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005637 if not issue:
5638 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005639
Gavin Makbe2e9262022-11-08 23:41:55 +00005640 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005641 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005642 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005643 if not base:
5644 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5645 revision_info = detail['revisions'][detail['current_revision']]
5646 fetch_info = revision_info['fetch']['http']
5647 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5648 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005649
Aaron Gablea718c3e2017-08-28 17:47:28 -07005650 cmd = ['git', 'diff']
5651 if options.stat:
5652 cmd.append('--stat')
5653 cmd.append(base)
5654 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005655
5656 return 0
5657
5658
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005659@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005660def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005661 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005662 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005663 '--ignore-current',
5664 action='store_true',
5665 help='Ignore the CL\'s current reviewers and start from scratch.')
5666 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005667 '--ignore-self',
5668 action='store_true',
5669 help='Do not consider CL\'s author as an owners.')
5670 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005671 '--no-color',
5672 action='store_true',
5673 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005674 parser.add_option(
5675 '--batch',
5676 action='store_true',
5677 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005678 # TODO: Consider moving this to another command, since other
5679 # git-cl owners commands deal with owners for a given CL.
5680 parser.add_option(
5681 '--show-all',
5682 action='store_true',
5683 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005684 options, args = parser.parse_args(args)
5685
Edward Lemur934836a2019-09-09 20:16:54 +00005686 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005687 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005688
Yang Guo6e269a02019-06-26 11:17:02 +00005689 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005690 if len(args) == 0:
5691 print('No files specified for --show-all. Nothing to do.')
5692 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005693 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005694 for path in args:
5695 print('Owners for %s:' % path)
5696 print('\n'.join(
5697 ' - %s' % owner
5698 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005699 return 0
5700
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005701 if args:
5702 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005703 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005704 base_branch = args[0]
5705 else:
5706 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005707 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005708
Edward Lemur2c62b332020-03-12 22:12:33 +00005709 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005710
5711 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005712 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5713 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005714 return 0
5715
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005716 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005717 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005718 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005719 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005720 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005721 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005722 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005723
5724
Aiden Bennerc08566e2018-10-03 17:52:42 +00005725def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005726 """Generates a diff command."""
5727 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005728 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5729
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005730 if allow_prefix:
5731 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5732 # case that diff.noprefix is set in the user's git config.
5733 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5734 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005735 diff_cmd += ['--no-prefix']
5736
5737 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005738
5739 if args:
5740 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005741 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005742 diff_cmd.append(arg)
5743 else:
5744 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005745
5746 return diff_cmd
5747
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005748
Jamie Madill5e96ad12020-01-13 16:08:35 +00005749def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5750 """Runs clang-format-diff and sets a return value if necessary."""
5751
5752 if not clang_diff_files:
5753 return 0
5754
5755 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5756 # formatted. This is used to block during the presubmit.
5757 return_value = 0
5758
5759 # Locate the clang-format binary in the checkout
5760 try:
5761 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5762 except clang_format.NotFoundError as e:
5763 DieWithError(e)
5764
5765 if opts.full or settings.GetFormatFullByDefault():
5766 cmd = [clang_format_tool]
5767 if not opts.dry_run and not opts.diff:
5768 cmd.append('-i')
5769 if opts.dry_run:
5770 for diff_file in clang_diff_files:
5771 with open(diff_file, 'r') as myfile:
5772 code = myfile.read().replace('\r\n', '\n')
5773 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5774 stdout = stdout.replace('\r\n', '\n')
5775 if opts.diff:
5776 sys.stdout.write(stdout)
5777 if code != stdout:
5778 return_value = 2
5779 else:
5780 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5781 if opts.diff:
5782 sys.stdout.write(stdout)
5783 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005784 try:
5785 script = clang_format.FindClangFormatScriptInChromiumTree(
5786 'clang-format-diff.py')
5787 except clang_format.NotFoundError as e:
5788 DieWithError(e)
5789
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005790 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005791 if not opts.dry_run and not opts.diff:
5792 cmd.append('-i')
5793
5794 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005795 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005796
Edward Lesmes89624cd2020-04-06 17:51:56 +00005797 env = os.environ.copy()
5798 env['PATH'] = (
5799 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5800 stdout = RunCommand(
5801 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005802 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005803 if opts.diff:
5804 sys.stdout.write(stdout)
5805 if opts.dry_run and len(stdout) > 0:
5806 return_value = 2
5807
5808 return return_value
5809
5810
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005811def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5812 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5813 presubmit checks have failed (and returns 0 otherwise)."""
5814
5815 if not rust_diff_files:
5816 return 0
5817
5818 # Locate the rustfmt binary.
5819 try:
5820 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5821 except rustfmt.NotFoundError as e:
5822 DieWithError(e)
5823
5824 # TODO(crbug.com/1231317): Support formatting only the changed lines
5825 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5826 # https://github.com/emilio/rustfmt-format-diff
5827 cmd = [rustfmt_tool]
5828 if opts.dry_run:
5829 cmd.append('--check')
5830 cmd += rust_diff_files
5831 rustfmt_exitcode = subprocess2.call(cmd)
5832
5833 if opts.presubmit and rustfmt_exitcode != 0:
5834 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005835
5836 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005837
5838
Olivier Robin0a6b5442022-04-07 07:25:04 +00005839def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5840 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5841 that presubmit checks have failed (and returns 0 otherwise)."""
5842
5843 if not swift_diff_files:
5844 return 0
5845
5846 # Locate the swift-format binary.
5847 try:
5848 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5849 except swift_format.NotFoundError as e:
5850 DieWithError(e)
5851
5852 cmd = [swift_format_tool]
5853 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005854 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005855 else:
5856 cmd += ['format', '-i']
5857 cmd += swift_diff_files
5858 swift_format_exitcode = subprocess2.call(cmd)
5859
5860 if opts.presubmit and swift_format_exitcode != 0:
5861 return 2
5862
5863 return 0
5864
5865
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005866def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005867 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005868 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005869
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005870
enne@chromium.org555cfe42014-01-29 18:21:39 +00005871@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005872@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005873def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005874 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005875 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005876 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005877 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005878 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005879 parser.add_option('--full', action='store_true',
5880 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005881 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005882 parser.add_option('--dry-run', action='store_true',
5883 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005884 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005885 '--no-clang-format',
5886 dest='clang_format',
5887 action='store_false',
5888 default=True,
5889 help='Disables formatting of various file types using clang-format.')
5890 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005891 '--python',
5892 action='store_true',
5893 default=None,
5894 help='Enables python formatting on all python files.')
5895 parser.add_option(
5896 '--no-python',
5897 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005898 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005899 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005900 'If neither --python or --no-python are set, python files that have a '
5901 '.style.yapf file in an ancestor directory will be formatted. '
5902 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005903 parser.add_option(
5904 '--js',
5905 action='store_true',
5906 help='Format javascript code with clang-format. '
5907 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005908 parser.add_option('--diff', action='store_true',
5909 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005910 parser.add_option('--presubmit', action='store_true',
5911 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005912
5913 parser.add_option('--rust-fmt',
5914 dest='use_rust_fmt',
5915 action='store_true',
5916 default=rustfmt.IsRustfmtSupported(),
5917 help='Enables formatting of Rust file types using rustfmt.')
5918 parser.add_option(
5919 '--no-rust-fmt',
5920 dest='use_rust_fmt',
5921 action='store_false',
5922 help='Disables formatting of Rust file types using rustfmt.')
5923
Olivier Robin0a6b5442022-04-07 07:25:04 +00005924 parser.add_option(
5925 '--swift-format',
5926 dest='use_swift_format',
5927 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005928 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005929 help='Enables formatting of Swift file types using swift-format '
5930 '(macOS host only).')
5931 parser.add_option(
5932 '--no-swift-format',
5933 dest='use_swift_format',
5934 action='store_false',
5935 help='Disables formatting of Swift file types using swift-format.')
5936
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005937 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005938
Garrett Beaty91a6f332020-01-06 16:57:24 +00005939 if opts.python is not None and opts.no_python:
5940 raise parser.error('Cannot set both --python and --no-python')
5941 if opts.no_python:
5942 opts.python = False
5943
Daniel Chengc55eecf2016-12-30 03:11:02 -08005944 # Normalize any remaining args against the current path, so paths relative to
5945 # the current directory are still resolved as expected.
5946 args = [os.path.join(os.getcwd(), arg) for arg in args]
5947
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005948 # git diff generates paths against the root of the repository. Change
5949 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005950 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005951 if rel_base_path:
5952 os.chdir(rel_base_path)
5953
digit@chromium.org29e47272013-05-17 17:01:46 +00005954 # Grab the merge-base commit, i.e. the upstream commit of the current
5955 # branch when it was created or the last time it was rebased. This is
5956 # to cover the case where the user may have called "git fetch origin",
5957 # moving the origin branch to a newer commit, but hasn't rebased yet.
5958 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005959 upstream_branch = opts.upstream
5960 if not upstream_branch:
5961 cl = Changelist()
5962 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005963 if upstream_branch:
5964 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5965 upstream_commit = upstream_commit.strip()
5966
5967 if not upstream_commit:
5968 DieWithError('Could not find base commit for this branch. '
5969 'Are you in detached state?')
5970
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005971 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5972 diff_output = RunGit(changed_files_cmd)
5973 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005974 # Filter out files deleted by this CL
5975 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005976
Andreas Haas417d89c2020-02-06 10:24:27 +00005977 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005978 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005979
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005980 clang_diff_files = []
5981 if opts.clang_format:
5982 clang_diff_files = [
5983 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5984 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005985 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005986 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005987 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005988 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005989
Edward Lesmes50da7702020-03-30 19:23:43 +00005990 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005991
Jamie Madill5e96ad12020-01-13 16:08:35 +00005992 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5993 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005994
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005995 if opts.use_rust_fmt:
5996 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5997 upstream_commit)
5998 if rust_fmt_return_value == 2:
5999 return_value = 2
6000
Olivier Robin0a6b5442022-04-07 07:25:04 +00006001 if opts.use_swift_format:
6002 if sys.platform != 'darwin':
6003 DieWithError('swift-format is only supported on macOS.')
6004 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
6005 upstream_commit)
6006 if swift_format_return_value == 2:
6007 return_value = 2
6008
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006009 # Similar code to above, but using yapf on .py files rather than clang-format
6010 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006011 py_explicitly_disabled = opts.python is not None and not opts.python
6012 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00006013 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6014 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006015
Aiden Bennerc08566e2018-10-03 17:52:42 +00006016 # Used for caching.
6017 yapf_configs = {}
6018 for f in python_diff_files:
6019 # Find the yapf style config for the current file, defaults to depot
6020 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006021 _FindYapfConfigFile(f, yapf_configs, top_dir)
6022
6023 # Turn on python formatting by default if a yapf config is specified.
6024 # This breaks in the case of this repo though since the specified
6025 # style file is also the global default.
6026 if opts.python is None:
6027 filtered_py_files = []
6028 for f in python_diff_files:
6029 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6030 filtered_py_files.append(f)
6031 else:
6032 filtered_py_files = python_diff_files
6033
6034 # Note: yapf still seems to fix indentation of the entire file
6035 # even if line ranges are specified.
6036 # See https://github.com/google/yapf/issues/499
6037 if not opts.full and filtered_py_files:
6038 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6039
Brian Sheedyb4307d52019-12-02 19:18:17 +00006040 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6041 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6042 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006043
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006044 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006045 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6046 # Default to pep8 if not .style.yapf is found.
6047 if not yapf_style:
6048 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006049
Peter Wend9399922020-06-17 17:33:49 +00006050 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006051 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006052 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006053 else:
6054 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006055
6056 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006057
6058 has_formattable_lines = False
6059 if not opts.full:
6060 # Only run yapf over changed line ranges.
6061 for diff_start, diff_len in py_line_diffs[f]:
6062 diff_end = diff_start + diff_len - 1
6063 # Yapf errors out if diff_end < diff_start but this
6064 # is a valid line range diff for a removal.
6065 if diff_end >= diff_start:
6066 has_formattable_lines = True
6067 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6068 # If all line diffs were removals we have nothing to format.
6069 if not has_formattable_lines:
6070 continue
6071
6072 if opts.diff or opts.dry_run:
6073 cmd += ['--diff']
6074 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006075 stdout = RunCommand(cmd,
6076 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006077 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006078 cwd=top_dir,
6079 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006080 if opts.diff:
6081 sys.stdout.write(stdout)
6082 elif len(stdout) > 0:
6083 return_value = 2
6084 else:
6085 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006086 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006087
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006088 # Format GN build files. Always run on full build files for canonical form.
6089 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006090 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006091 if opts.dry_run or opts.diff:
6092 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006093 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006094 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006095 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006096 cwd=top_dir)
6097 if opts.dry_run and gn_ret == 2:
6098 return_value = 2 # Not formatted.
6099 elif opts.diff and gn_ret == 2:
6100 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006101 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006102 elif gn_ret != 0:
6103 # For non-dry run cases (and non-2 return values for dry-run), a
6104 # nonzero error code indicates a failure, probably because the file
6105 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006106 DieWithError('gn format failed on ' + gn_diff_file +
6107 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006108
Ilya Shermane081cbe2017-08-15 17:51:04 -07006109 # Skip the metrics formatting from the global presubmit hook. These files have
6110 # a separate presubmit hook that issues an error if the files need formatting,
6111 # whereas the top-level presubmit script merely issues a warning. Formatting
6112 # these files is somewhat slow, so it's important not to duplicate the work.
6113 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006114 for diff_xml in GetDiffXMLs(diff_files):
6115 xml_dir = GetMetricsDir(diff_xml)
6116 if not xml_dir:
6117 continue
6118
Ilya Shermane081cbe2017-08-15 17:51:04 -07006119 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006120 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006121 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006122
6123 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6124 # command as histograms/pretty_print.py now needs a relative path argument
6125 # after splitting the histograms into multiple directories.
6126 # For example, in tools/metrics/ukm, pretty-print could be run using:
6127 # $ python pretty_print.py
6128 # But in tools/metrics/histogrmas, pretty-print should be run with an
6129 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006130 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006131 # $ python pretty_print.py enums.xml
6132
Weilun Shib92c4b72020-08-27 17:45:11 +00006133 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006134 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006135 cmd.append(diff_xml)
6136
Ilya Shermane081cbe2017-08-15 17:51:04 -07006137 if opts.dry_run or opts.diff:
6138 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006139
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006140 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6141 # `shell` param and instead replace `'vpython'` with
6142 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006143 stdout = RunCommand(cmd,
6144 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006145 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006146 if opts.diff:
6147 sys.stdout.write(stdout)
6148 if opts.dry_run and stdout:
6149 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006150
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006151 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006152
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006153
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006154def GetDiffXMLs(diff_files):
6155 return [
6156 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6157 ]
6158
6159
6160def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006161 metrics_xml_dirs = [
6162 os.path.join('tools', 'metrics', 'actions'),
6163 os.path.join('tools', 'metrics', 'histograms'),
6164 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006165 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006166 os.path.join('tools', 'metrics', 'ukm'),
6167 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006168 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006169 if diff_xml.startswith(xml_dir):
6170 return xml_dir
6171 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006172
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006173
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006174@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006175@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006176def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006177 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006178 _, args = parser.parse_args(args)
6179
6180 if len(args) != 1:
6181 parser.print_help()
6182 return 1
6183
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006184 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006185 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006186 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006187
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006188 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006189
Edward Lemur52969c92020-02-06 18:15:28 +00006190 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006191 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006192 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006193
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006194 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006195 for key, issue in [x.split() for x in output.splitlines()]:
6196 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006197 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006198
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006199 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006200 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006201 return 1
6202 if len(branches) == 1:
6203 RunGit(['checkout', branches[0]])
6204 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006205 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006206 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006207 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006208 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006209 try:
6210 RunGit(['checkout', branches[int(which)]])
6211 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006212 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006213 return 1
6214
6215 return 0
6216
6217
maruel@chromium.org29404b52014-09-08 22:58:00 +00006218def CMDlol(parser, args):
6219 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006220 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006221 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6222 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6223 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006224 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006225 return 0
6226
6227
Josip Sokcevic0399e172022-03-21 23:11:51 +00006228def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006229 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006230 print(utils.depot_tools_version())
6231
6232
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006233class OptionParser(optparse.OptionParser):
6234 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006235
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006236 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006237 optparse.OptionParser.__init__(
6238 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006239 self.add_option(
6240 '-v', '--verbose', action='count', default=0,
6241 help='Use 2 times for more debugging info')
6242
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006243 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006244 try:
6245 return self._parse_args(args)
6246 finally:
6247 # Regardless of success or failure of args parsing, we want to report
6248 # metrics, but only after logging has been initialized (if parsing
6249 # succeeded).
6250 global settings
6251 settings = Settings()
6252
Edward Lesmes9c349062021-05-06 20:02:39 +00006253 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006254 try:
6255 # GetViewVCUrl ultimately calls logging method.
6256 project_url = settings.GetViewVCUrl().strip('/+')
6257 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6258 metrics.collector.add('project_urls', [project_url])
6259 except subprocess2.CalledProcessError:
6260 # Occurs when command is not executed in a git repository
6261 # We should not fail here. If the command needs to be executed
6262 # in a repo, it will be raised later.
6263 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006264
6265 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006266 # Create an optparse.Values object that will store only the actual passed
6267 # options, without the defaults.
6268 actual_options = optparse.Values()
6269 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6270 # Create an optparse.Values object with the default options.
6271 options = optparse.Values(self.get_default_values().__dict__)
6272 # Update it with the options passed by the user.
6273 options._update_careful(actual_options.__dict__)
6274 # Store the options passed by the user in an _actual_options attribute.
6275 # We store only the keys, and not the values, since the values can contain
6276 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006277 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006278
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006279 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006280 logging.basicConfig(
6281 level=levels[min(options.verbose, len(levels) - 1)],
6282 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6283 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006284
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006285 return options, args
6286
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006287
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006288def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006289 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006290 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006291 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006292 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006293
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006294 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006295 dispatcher = subcommand.CommandDispatcher(__name__)
6296 try:
6297 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006298 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006299 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006300 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006301 if e.code != 500:
6302 raise
6303 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006304 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006305 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006306 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006307
6308
6309if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006310 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6311 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006312 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006313 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006314 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006315 sys.exit(main(sys.argv[1:]))