blob: 9d003f8687bc3c519953cc3c9f15b2664ce5bc9d [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])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001517 run_py2 = not py3_only and os.getenv('LUCI_OMIT_PYTHON2') != 'true'
1518 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001519 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1520 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1521 ['--use-python3'])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001522 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001523 p_py2.wait()
1524 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001525
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001527 # type: (optparse.Values, Sequence[str], Sequence[str]
1528 # ) -> ChangeDescription
1529 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001530 if self.GetIssue():
1531 description = self.FetchDescription()
1532 elif options.message:
1533 description = options.message
1534 else:
1535 description = _create_description_from_log(git_diff_args)
1536 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001537 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001538
Edward Lemur5a644f82020-03-18 16:44:57 +00001539 bug = options.bug
1540 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001541 if not self.GetIssue():
1542 # Extract bug number from branch name, but only if issue is being created.
1543 # It must start with bug or fix, followed by _ or - and number.
1544 # Optionally, it may contain _ or - after number with arbitrary text.
1545 # Examples:
1546 # bug-123
1547 # bug_123
1548 # fix-123
1549 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001550 branch = self.GetBranch()
1551 if branch is not None:
1552 match = re.match(
1553 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1554 if not bug and not fixed and match:
1555 if match.group('type') == 'bug':
1556 bug = match.group('bugnum')
1557 else:
1558 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001559
1560 change_description = ChangeDescription(description, bug, fixed)
1561
Joanna Wang39811b12023-01-20 23:09:48 +00001562 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001563 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001564 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001565 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001566 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001567 missing_files = [
1568 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001569 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001570 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001571 owners = self.owners_client.SuggestOwners(
1572 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001573 assert isinstance(options.reviewers, list), options.reviewers
1574 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001575
Edward Lemur5a644f82020-03-18 16:44:57 +00001576 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001577 if options.reviewers:
1578 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001579
1580 return change_description
1581
Joanna Wanga1abbed2023-01-24 01:41:05 +00001582 def _GetTitleForUpload(self, options, multi_change_upload=False):
1583 # type: (optparse.Values, Optional[bool]) -> str
1584
1585 # Getting titles for multipl commits is not supported so we return the
1586 # default.
1587 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001588 return options.title
1589
1590 # On first upload, patchset title is always this string, while options.title
1591 # gets converted to first line of message.
1592 if not self.GetIssue():
1593 return 'Initial upload'
1594
1595 # When uploading subsequent patchsets, options.message is taken as the title
1596 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001597 if options.message:
1598 return options.message.strip()
1599
1600 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001601 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001602 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001603 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001604 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001605
1606 # Use the default title if the user confirms the default with a 'y'.
1607 if user_title.lower() == 'y':
1608 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001609 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001610
Joanna Wang562481d2023-01-26 21:57:14 +00001611 def _GetRefSpecOptions(self,
1612 options,
1613 change_desc,
1614 multi_change_upload=False,
1615 dogfood_path=False):
1616 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1617 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001618
1619 # Extra options that can be specified at push time. Doc:
1620 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1621 refspec_opts = []
1622
1623 # By default, new changes are started in WIP mode, and subsequent patchsets
1624 # don't send email. At any time, passing --send-mail or --send-email will
1625 # mark the change ready and send email for that particular patch.
1626 if options.send_mail:
1627 refspec_opts.append('ready')
1628 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001629 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001630 refspec_opts.append('wip')
1631 else:
1632 refspec_opts.append('notify=NONE')
1633
1634 # TODO(tandrii): options.message should be posted as a comment if
1635 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1636 # to do it.
1637
1638 # Set options.title in case user was prompted in _GetTitleForUpload and
1639 # _CMDUploadChange needs to be called again.
1640 options.title = self._GetTitleForUpload(
1641 options, multi_change_upload=multi_change_upload)
1642
1643 if options.title:
1644 # Punctuation and whitespace in |title| must be percent-encoded.
1645 refspec_opts.append('m=' +
1646 gerrit_util.PercentEncodeForGitRef(options.title))
1647
1648 if options.private:
1649 refspec_opts.append('private')
1650
1651 if options.topic:
1652 # Documentation on Gerrit topics is here:
1653 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1654 refspec_opts.append('topic=%s' % options.topic)
1655
1656 if options.enable_auto_submit:
1657 refspec_opts.append('l=Auto-Submit+1')
1658 if options.set_bot_commit:
1659 refspec_opts.append('l=Bot-Commit+1')
1660 if options.use_commit_queue:
1661 refspec_opts.append('l=Commit-Queue+2')
1662 elif options.cq_dry_run:
1663 refspec_opts.append('l=Commit-Queue+1')
1664 elif options.cq_quick_run:
1665 refspec_opts.append('l=Commit-Queue+1')
1666 refspec_opts.append('l=Quick-Run+1')
1667
1668 if change_desc.get_reviewers(tbr_only=True):
1669 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1670 self.GetGerritProject())
1671 refspec_opts.append('l=Code-Review+%s' % score)
1672
Joanna Wang40497912023-01-24 21:18:16 +00001673 # Gerrit sorts hashtags, so order is not important.
1674 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1675 # We check GetIssue because we only add hashtags from the
1676 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001677 # TODO(b/265929888): When we fully launch the new path:
1678 # 1) remove fetching hashtags from description alltogether
1679 # 2) Or use descrtiption hashtags for:
1680 # `not (self.GetIssue() and multi_change_upload)`
1681 # 3) Or enabled change description tags for multi and single changes
1682 # by adding them post `git push`.
1683 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001684 hashtags.update(change_desc.get_hash_tags())
1685 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001686
1687 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001688 # branch/change.
1689 return refspec_opts
1690
Joanna Wang05b60342023-03-29 20:25:57 +00001691 def PrepareSquashedCommit(self,
1692 options,
1693 parent,
1694 orig_parent,
1695 end_commit=None):
1696 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1697 """Create a squashed commit to upload.
1698
1699
1700 Args:
1701 parent: The commit to use as the parent for the new squashed.
1702 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1703 is part of the same original tree as end_commit, which does not
1704 contain squashed commits. This is used to create the change
1705 description for the new squashed commit with:
1706 `git log orig_parent..end_commit`.
1707 end_commit: The commit to use as the end of the new squashed commit.
1708 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001709
1710 if end_commit is None:
1711 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1712
Joanna Wang05b60342023-03-29 20:25:57 +00001713 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001714 end_commit)
1715 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1716 with gclient_utils.temporary_file() as desc_tempfile:
1717 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1718 commit_to_push = RunGit(
1719 ['commit-tree', latest_tree, '-p', parent, '-F',
1720 desc_tempfile]).strip()
1721
Joanna Wang7603f042023-03-01 22:17:36 +00001722 # Gerrit may or may not update fast enough to return the correct patchset
1723 # number after we push. Get the pre-upload patchset and increment later.
1724 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001725 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001726 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001727
Joanna Wang6215dd02023-02-07 15:58:03 +00001728 def PrepareCherryPickSquashedCommit(self, options, parent):
1729 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001730 """Create a commit cherry-picked on parent to push."""
1731
Joanna Wang6215dd02023-02-07 15:58:03 +00001732 # The `parent` is what we will cherry-pick on top of.
1733 # The `cherry_pick_base` is the beginning range of what
1734 # we are cherry-picking.
1735 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1736 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001737 self.branchref)
1738
1739 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1740 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1741 with gclient_utils.temporary_file() as desc_tempfile:
1742 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001743 commit_to_cp = RunGit([
1744 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1745 desc_tempfile
1746 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001747
Joanna Wang6215dd02023-02-07 15:58:03 +00001748 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001749 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1750 if ret:
1751 RunGit(['cherry-pick', '--abort'])
1752 RunGit(['checkout', '-q', self.branch])
1753 DieWithError('Could not cleanly cherry-pick')
1754
Joanna Wang6215dd02023-02-07 15:58:03 +00001755 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001756 RunGit(['checkout', '-q', self.branch])
1757
Joanna Wang7603f042023-03-01 22:17:36 +00001758 # Gerrit may or may not update fast enough to return the correct patchset
1759 # number after we push. Get the pre-upload patchset and increment later.
1760 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001761 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001762 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001763
Joanna Wangb46232e2023-01-21 01:58:46 +00001764 def _PrepareChange(self, options, parent, end_commit):
1765 # type: (optparse.Values, str, str) ->
1766 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1767 """Prepares the change to be uploaded."""
1768 self.EnsureCanUploadPatchset(options.force)
1769
1770 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1771 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1772 files)
1773
1774 watchlist = watchlists.Watchlists(settings.GetRoot())
1775 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1776 if not options.bypass_hooks:
1777 hook_results = self.RunHook(committing=False,
1778 may_prompt=not options.force,
1779 verbose=options.verbose,
1780 parallel=options.parallel,
1781 upstream=parent,
1782 description=change_desc.description,
1783 all_files=False)
1784 self.ExtendCC(hook_results['more_cc'])
1785
1786 # Update the change description and ensure we have a Change Id.
1787 if self.GetIssue():
1788 if options.edit_description:
1789 change_desc.prompt()
1790 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1791 change_id = change_detail['change_id']
1792 change_desc.ensure_change_id(change_id)
1793
Joanna Wangb46232e2023-01-21 01:58:46 +00001794 else: # No change issue. First time uploading
1795 if not options.force and not options.message_file:
1796 change_desc.prompt()
1797
1798 # Check if user added a change_id in the descripiton.
1799 change_ids = git_footers.get_footer_change_id(change_desc.description)
1800 if len(change_ids) == 1:
1801 change_id = change_ids[0]
1802 else:
1803 change_id = GenerateGerritChangeId(change_desc.description)
1804 change_desc.ensure_change_id(change_id)
1805
1806 if options.preserve_tryjobs:
1807 change_desc.set_preserve_tryjobs()
1808
1809 SaveDescriptionBackup(change_desc)
1810
1811 # Add ccs
1812 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001813 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001814 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001815 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001816 ccs = self.GetCCList().split(',')
1817 if len(ccs) > 100:
1818 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1819 'process/lsc/lsc_workflow.md')
1820 print('WARNING: This will auto-CC %s users.' % len(ccs))
1821 print('LSC may be more appropriate: %s' % lsc)
1822 print('You can also use the --no-autocc flag to disable auto-CC.')
1823 confirm_or_exit(action='continue')
1824
1825 # Add ccs from the --cc flag.
1826 if options.cc:
1827 ccs.extend(options.cc)
1828
1829 ccs = [email.strip() for email in ccs if email.strip()]
1830 if change_desc.get_cced():
1831 ccs.extend(change_desc.get_cced())
1832
1833 return change_desc.get_reviewers(), ccs, change_desc
1834
Joanna Wang40497912023-01-24 21:18:16 +00001835 def PostUploadUpdates(self, options, new_upload, change_number):
1836 # type: (optparse.Values, _NewUpload, change_number) -> None
1837 """Makes necessary post upload changes to the local and remote cl."""
1838 if not self.GetIssue():
1839 self.SetIssue(change_number)
1840
Joanna Wang7603f042023-03-01 22:17:36 +00001841 self.SetPatchset(new_upload.prev_patchset + 1)
1842
Joanna Wang40497912023-01-24 21:18:16 +00001843 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1844 new_upload.commit_to_push)
1845 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1846 new_upload.new_last_uploaded_commit)
1847
1848 if settings.GetRunPostUploadHook():
1849 self.RunPostUploadHook(options.verbose, new_upload.parent,
1850 new_upload.change_desc.description,
1851 options.no_python2_post_upload_hooks)
1852
1853 if new_upload.reviewers or new_upload.ccs:
1854 gerrit_util.AddReviewers(self.GetGerritHost(),
1855 self._GerritChangeIdentifier(),
1856 reviewers=new_upload.reviewers,
1857 ccs=new_upload.ccs,
1858 notify=bool(options.send_mail))
1859
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001860 def CMDUpload(self, options, git_diff_args, orig_args):
1861 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001862 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001863 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001864 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001865 else:
1866 if self.GetBranch() is None:
1867 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1868
1869 # Default to diffing against common ancestor of upstream branch
1870 base_branch = self.GetCommonAncestorWithUpstream()
1871 git_diff_args = [base_branch, 'HEAD']
1872
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001873 # Fast best-effort checks to abort before running potentially expensive
1874 # hooks if uploading is likely to fail anyway. Passing these checks does
1875 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001876 self.EnsureAuthenticated(force=options.force)
1877 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001878
1879 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001880 watchlist = watchlists.Watchlists(settings.GetRoot())
1881 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001882 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001883 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001884
Edward Lemur5a644f82020-03-18 16:44:57 +00001885 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001886 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001887 hook_results = self.RunHook(committing=False,
1888 may_prompt=not options.force,
1889 verbose=options.verbose,
1890 parallel=options.parallel,
1891 upstream=base_branch,
1892 description=change_desc.description,
1893 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001894 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001895
Aaron Gable13101a62018-02-09 13:20:41 -08001896 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001897 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001898 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001899 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001900 if self.GetBranch() is not None:
1901 self._GitSetBranchConfigValue(
1902 LAST_UPLOAD_HASH_CONFIG_KEY,
1903 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001904 # Run post upload hooks, if specified.
1905 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001906 self.RunPostUploadHook(options.verbose, base_branch,
1907 change_desc.description,
1908 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001909
1910 # Upload all dependencies if specified.
1911 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001912 print()
1913 print('--dependencies has been specified.')
1914 print('All dependent local branches will be re-uploaded.')
1915 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001916 # Remove the dependencies flag from args so that we do not end up in a
1917 # loop.
1918 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001919 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001920 return ret
1921
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001922 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001923 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001924
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001925 Issue must have been already uploaded and known. Optionally allows for
1926 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001927 """
1928 assert new_state in _CQState.ALL_STATES
1929 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001930 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001931 vote_map = {
1932 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001933 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001934 _CQState.DRY_RUN: 1,
1935 _CQState.COMMIT: 2,
1936 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001937 if new_state == _CQState.QUICK_RUN:
1938 labels = {
1939 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1940 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1941 }
1942 else:
1943 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001944 notify = False if new_state == _CQState.DRY_RUN else None
1945 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001946 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001947 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001948 return 0
1949 except KeyboardInterrupt:
1950 raise
1951 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001952 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001953 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001954 ' * Your project has no CQ,\n'
1955 ' * You don\'t have permission to change the CQ state,\n'
1956 ' * There\'s a bug in this code (see stack trace below).\n'
1957 'Consider specifying which bots to trigger manually or asking your '
1958 'project owners for permissions or contacting Chrome Infra at:\n'
1959 'https://www.chromium.org/infra\n\n' %
1960 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001961 # Still raise exception so that stack trace is printed.
1962 raise
1963
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001964 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965 # Lazy load of configs.
1966 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001967 if self._gerrit_host and '.' not in self._gerrit_host:
1968 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1969 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001970 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001971 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001972 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001973 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001974 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1975 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001976 return self._gerrit_host
1977
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001978 def _GetGitHost(self):
1979 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001980 remote_url = self.GetRemoteUrl()
1981 if not remote_url:
1982 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001983 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001984
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001985 def GetCodereviewServer(self):
1986 if not self._gerrit_server:
1987 # If we're on a branch then get the server potentially associated
1988 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001989 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001990 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001991 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001992 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001993 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001994 if not self._gerrit_server:
1995 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1996 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001997 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001998 parts[0] = parts[0] + '-review'
1999 self._gerrit_host = '.'.join(parts)
2000 self._gerrit_server = 'https://%s' % self._gerrit_host
2001 return self._gerrit_server
2002
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002003 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002004 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002005 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002006 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002007 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002008 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00002009 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002010 if project.endswith('.git'):
2011 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002012 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2013 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2014 # gitiles/git-over-https protocol. E.g.,
2015 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2016 # as
2017 # https://chromium.googlesource.com/v8/v8
2018 if project.startswith('a/'):
2019 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002020 return project
2021
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002022 def _GerritChangeIdentifier(self):
2023 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2024
2025 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002026 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002027 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002028 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002029 if project:
2030 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2031 # Fall back on still unique, but less efficient change number.
2032 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002033
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002034 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002035 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002036 if settings.GetGerritSkipEnsureAuthenticated():
2037 # For projects with unusual authentication schemes.
2038 # See http://crbug.com/603378.
2039 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002040
2041 # Check presence of cookies only if using cookies-based auth method.
2042 cookie_auth = gerrit_util.Authenticator.get()
2043 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002044 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002045
Florian Mayerae510e82020-01-30 21:04:48 +00002046 remote_url = self.GetRemoteUrl()
2047 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002048 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002049 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002050 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2051 logging.warning(
2052 'Ignoring branch %(branch)s with non-https/sso remote '
2053 '%(remote)s', {
2054 'branch': self.branch,
2055 'remote': self.GetRemoteUrl()
2056 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002057 return
2058
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002059 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002060 self.GetCodereviewServer()
2061 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002062 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002063
2064 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2065 git_auth = cookie_auth.get_auth_header(git_host)
2066 if gerrit_auth and git_auth:
2067 if gerrit_auth == git_auth:
2068 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002069 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002070 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002071 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002072 ' %s\n'
2073 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002074 ' Consider running the following command:\n'
2075 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002076 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002077 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002078 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002079 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002080 cookie_auth.get_new_password_message(git_host)))
2081 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002082 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002083 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002084
2085 missing = (
2086 ([] if gerrit_auth else [self._gerrit_host]) +
2087 ([] if git_auth else [git_host]))
2088 DieWithError('Credentials for the following hosts are required:\n'
2089 ' %s\n'
2090 'These are read from %s (or legacy %s)\n'
2091 '%s' % (
2092 '\n '.join(missing),
2093 cookie_auth.get_gitcookies_path(),
2094 cookie_auth.get_netrc_path(),
2095 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002096
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002097 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002098 if not self.GetIssue():
2099 return
2100
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002101 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002102 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002103 DieWithError(
2104 'Change %s has been abandoned, new uploads are not allowed' %
2105 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002106 if status == 'MERGED':
2107 answer = gclient_utils.AskForData(
2108 'Change %s has been submitted, new uploads are not allowed. '
2109 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2110 ).lower()
2111 if answer not in ('y', ''):
2112 DieWithError('New uploads are not allowed.')
2113 self.SetIssue()
2114 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002115
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002116 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2117 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2118 # Apparently this check is not very important? Otherwise get_auth_email
2119 # could have been added to other implementations of Authenticator.
2120 cookies_auth = gerrit_util.Authenticator.get()
2121 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002122 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002123
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002124 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002125 if self.GetIssueOwner() == cookies_user:
2126 return
2127 logging.debug('change %s owner is %s, cookies user is %s',
2128 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002129 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002130 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002131 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002132 if details['email'] == self.GetIssueOwner():
2133 return
2134 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002135 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002136 'as %s.\n'
2137 'Uploading may fail due to lack of permissions.' %
2138 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2139 confirm_or_exit(action='upload')
2140
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002141 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002142 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002143 or CQ status, assuming adherence to a common workflow.
2144
2145 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002146 * 'error' - error from review tool (including deleted issues)
2147 * 'unsent' - no reviewers added
2148 * 'waiting' - waiting for review
2149 * 'reply' - waiting for uploader to reply to review
2150 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002151 * 'dry-run' - dry-running in the CQ
2152 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002153 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002154 """
2155 if not self.GetIssue():
2156 return None
2157
2158 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002159 data = self._GetChangeDetail([
2160 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002161 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002162 return 'error'
2163
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002164 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002165 return 'closed'
2166
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002167 cq_label = data['labels'].get('Commit-Queue', {})
2168 max_cq_vote = 0
2169 for vote in cq_label.get('all', []):
2170 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2171 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002172 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002173 if max_cq_vote == 1:
2174 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002175
Aaron Gable9ab38c62017-04-06 14:36:33 -07002176 if data['labels'].get('Code-Review', {}).get('approved'):
2177 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002178
2179 if not data.get('reviewers', {}).get('REVIEWER', []):
2180 return 'unsent'
2181
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002182 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002183 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002184 while messages:
2185 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002186 if (m.get('tag', '').startswith('autogenerated:cq') or
2187 m.get('tag', '').startswith('autogenerated:cv')):
2188 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002189 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002190 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002191 # Most recent message was by owner.
2192 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002193
2194 # Some reply from non-owner.
2195 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002196
2197 # Somehow there are no messages even though there are reviewers.
2198 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002199
Gavin Mak4e5e3992022-11-14 22:40:12 +00002200 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002201 if not self.GetIssue():
2202 return None
2203
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002204 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002205 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002206 if update:
2207 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002208 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002209
Gavin Makf35a9eb2022-11-17 18:34:36 +00002210 def _IsPatchsetRangeSignificant(self, lower, upper):
2211 """Returns True if the inclusive range of patchsets contains any reworks or
2212 rebases."""
2213 if not self.GetIssue():
2214 return False
2215
2216 data = self._GetChangeDetail(['ALL_REVISIONS'])
2217 ps_kind = {}
2218 for rev_info in data.get('revisions', {}).values():
2219 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2220
2221 for ps in range(lower, upper + 1):
2222 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2223 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2224 return True
2225 return False
2226
Gavin Make61ccc52020-11-13 00:12:57 +00002227 def GetMostRecentDryRunPatchset(self):
2228 """Get patchsets equivalent to the most recent patchset and return
2229 the patchset with the latest dry run. If none have been dry run, return
2230 the latest patchset."""
2231 if not self.GetIssue():
2232 return None
2233
2234 data = self._GetChangeDetail(['ALL_REVISIONS'])
2235 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002236 dry_run = {int(m['_revision_number'])
2237 for m in data.get('messages', [])
2238 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002239
2240 for revision_info in sorted(data.get('revisions', {}).values(),
2241 key=lambda c: c['_number'], reverse=True):
2242 if revision_info['_number'] in dry_run:
2243 patchset = revision_info['_number']
2244 break
2245 if revision_info.get('kind', '') not in \
2246 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2247 break
2248 self.SetPatchset(patchset)
2249 return patchset
2250
Aaron Gable636b13f2017-07-14 10:42:48 -07002251 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002252 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002253 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002254 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002255
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002256 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002257 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002258 # CURRENT_REVISION is included to get the latest patchset so that
2259 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002260 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002261 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2262 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002263 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002264 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002265 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002266 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002267
2268 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002269 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002270 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002271 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002272 line_comments = file_comments.setdefault(path, [])
2273 line_comments.extend(
2274 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002275
2276 # Build dictionary of file comments for easy access and sorting later.
2277 # {author+date: {path: {patchset: {line: url+message}}}}
2278 comments = collections.defaultdict(
2279 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002280
2281 server = self.GetCodereviewServer()
2282 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2283 # /c/ is automatically added by short URL server.
2284 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2285 self.GetIssue())
2286 else:
2287 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2288
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002289 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002290 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002291 tag = comment.get('tag', '')
2292 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002293 continue
2294 key = (comment['author']['email'], comment['updated'])
2295 if comment.get('side', 'REVISION') == 'PARENT':
2296 patchset = 'Base'
2297 else:
2298 patchset = 'PS%d' % comment['patch_set']
2299 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002300 url = ('%s/%s/%s#%s%s' %
2301 (url_prefix, comment['patch_set'], path,
2302 'b' if comment.get('side') == 'PARENT' else '',
2303 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002304 comments[key][path][patchset][line] = (url, comment['message'])
2305
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002306 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002307 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002308 summary = self._BuildCommentSummary(msg, comments, readable)
2309 if summary:
2310 summaries.append(summary)
2311 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002312
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002313 @staticmethod
2314 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002315 if 'email' not in msg['author']:
2316 # Some bot accounts may not have an email associated.
2317 return None
2318
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002319 key = (msg['author']['email'], msg['date'])
2320 # Don't bother showing autogenerated messages that don't have associated
2321 # file or line comments. this will filter out most autogenerated
2322 # messages, but will keep robot comments like those from Tricium.
2323 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2324 if is_autogenerated and not comments.get(key):
2325 return None
2326 message = msg['message']
2327 # Gerrit spits out nanoseconds.
2328 assert len(msg['date'].split('.')[-1]) == 9
2329 date = datetime.datetime.strptime(msg['date'][:-3],
2330 '%Y-%m-%d %H:%M:%S.%f')
2331 if key in comments:
2332 message += '\n'
2333 for path, patchsets in sorted(comments.get(key, {}).items()):
2334 if readable:
2335 message += '\n%s' % path
2336 for patchset, lines in sorted(patchsets.items()):
2337 for line, (url, content) in sorted(lines.items()):
2338 if line:
2339 line_str = 'Line %d' % line
2340 path_str = '%s:%d:' % (path, line)
2341 else:
2342 line_str = 'File comment'
2343 path_str = '%s:0:' % path
2344 if readable:
2345 message += '\n %s, %s: %s' % (patchset, line_str, url)
2346 message += '\n %s\n' % content
2347 else:
2348 message += '\n%s ' % path_str
2349 message += '\n%s\n' % content
2350
2351 return _CommentSummary(
2352 date=date,
2353 message=message,
2354 sender=msg['author']['email'],
2355 autogenerated=is_autogenerated,
2356 # These could be inferred from the text messages and correlated with
2357 # Code-Review label maximum, however this is not reliable.
2358 # Leaving as is until the need arises.
2359 approval=False,
2360 disapproval=False,
2361 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002362
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002363 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002364 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002365 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002366
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002367 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002368 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002369 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002370
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002371 def _GetChangeDetail(self, options=None):
2372 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002373 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002374 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002375
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002376 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002377 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002378 options.append('CURRENT_COMMIT')
2379
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002380 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002381 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002382 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002383
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002384 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2385 # Assumption: data fetched before with extra options is suitable
2386 # for return for a smaller set of options.
2387 # For example, if we cached data for
2388 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2389 # and request is for options=[CURRENT_REVISION],
2390 # THEN we can return prior cached data.
2391 if options_set.issubset(cached_options_set):
2392 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002393
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002394 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002395 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002396 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002397 except gerrit_util.GerritError as e:
2398 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002399 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002400 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002401
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002402 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002403 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002404
Gavin Mak4e5e3992022-11-14 22:40:12 +00002405 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002406 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002407 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002408 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2409 self._GerritChangeIdentifier(),
2410 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002411 except gerrit_util.GerritError as e:
2412 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002413 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002414 raise
agable32978d92016-11-01 12:55:02 -07002415 return data
2416
Karen Qian40c19422019-03-13 21:28:29 +00002417 def _IsCqConfigured(self):
2418 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002419 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002420
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002421 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002422 if git_common.is_dirty_git_tree('land'):
2423 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002424
tandriid60367b2016-06-22 05:25:12 -07002425 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002426 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002427 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002428 'which can test and land changes for you. '
2429 'Are you sure you wish to bypass it?\n',
2430 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002431 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002432 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002433 # Note: git diff outputs nothing if there is no diff.
2434 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002435 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002436 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002437 if detail['current_revision'] == last_upload:
2438 differs = False
2439 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002440 print('WARNING: Local branch contents differ from latest uploaded '
2441 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002442 if differs:
2443 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002444 confirm_or_exit(
2445 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2446 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002447 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002448 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002449 upstream = self.GetCommonAncestorWithUpstream()
2450 if self.GetIssue():
2451 description = self.FetchDescription()
2452 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002453 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002454 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002455 committing=True,
2456 may_prompt=not force,
2457 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002458 parallel=parallel,
2459 upstream=upstream,
2460 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002461 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002462 resultdb=resultdb,
2463 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002464
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002465 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002466 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002467 links = self._GetChangeCommit().get('web_links', [])
2468 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002469 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002470 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002471 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002472 return 0
2473
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002474 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2475 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002476 assert parsed_issue_arg.valid
2477
Edward Lemur125d60a2019-09-13 18:25:41 +00002478 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002479
2480 if parsed_issue_arg.hostname:
2481 self._gerrit_host = parsed_issue_arg.hostname
2482 self._gerrit_server = 'https://%s' % self._gerrit_host
2483
tandriic2405f52016-10-10 08:13:15 -07002484 try:
2485 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002486 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002487 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002488
2489 if not parsed_issue_arg.patchset:
2490 # Use current revision by default.
2491 revision_info = detail['revisions'][detail['current_revision']]
2492 patchset = int(revision_info['_number'])
2493 else:
2494 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002495 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002496 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2497 break
2498 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002499 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002500 (parsed_issue_arg.patchset, self.GetIssue()))
2501
Edward Lemur125d60a2019-09-13 18:25:41 +00002502 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002503 if remote_url.endswith('.git'):
2504 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002505 remote_url = remote_url.rstrip('/')
2506
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002507 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002508 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002509
2510 if remote_url != fetch_info['url']:
2511 DieWithError('Trying to patch a change from %s but this repo appears '
2512 'to be %s.' % (fetch_info['url'], remote_url))
2513
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002514 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002515
Joanna Wangc023a632023-01-26 17:59:25 +00002516 # Set issue immediately in case the cherry-pick fails, which happens
2517 # when resolving conflicts.
2518 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002519 self.SetIssue(parsed_issue_arg.issue)
2520
Aaron Gable62619a32017-06-16 08:22:09 -07002521 if force:
2522 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2523 print('Checked out commit for change %i patchset %i locally' %
2524 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002525 elif nocommit:
2526 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2527 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002528 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002529 RunGit(['cherry-pick', 'FETCH_HEAD'])
2530 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002531 (parsed_issue_arg.issue, patchset))
2532 print('Note: this created a local commit which does not have '
2533 'the same hash as the one uploaded for review. This will make '
2534 'uploading changes based on top of this branch difficult.\n'
2535 'If you want to do that, use "git cl patch --force" instead.')
2536
Stefan Zagerd08043c2017-10-12 12:07:02 -07002537 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002538 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002539 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002540 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2541 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002542 else:
2543 print('WARNING: You are in detached HEAD state.\n'
2544 'The patch has been applied to your checkout, but you will not be '
2545 'able to upload a new patch set to the gerrit issue.\n'
2546 'Try using the \'-b\' option if you would like to work on a '
2547 'branch and/or upload a new patch set.')
2548
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002549 return 0
2550
Joanna Wang18de1f62023-01-21 01:24:24 +00002551 @staticmethod
2552 def _GerritCommitMsgHookCheck(offer_removal):
2553 # type: (bool) -> None
2554 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002555 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2556 if not os.path.exists(hook):
2557 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002558 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2559 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002560 data = gclient_utils.FileRead(hook)
2561 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2562 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002563 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002564 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002565 'and may interfere with it in subtle ways.\n'
2566 'We recommend you remove the commit-msg hook.')
2567 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002568 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002569 gclient_utils.rm_file_or_tree(hook)
2570 print('Gerrit commit-msg hook removed.')
2571 else:
2572 print('OK, will keep Gerrit commit-msg hook in place.')
2573
Edward Lemur1b52d872019-05-09 21:12:12 +00002574 def _CleanUpOldTraces(self):
2575 """Keep only the last |MAX_TRACES| traces."""
2576 try:
2577 traces = sorted([
2578 os.path.join(TRACES_DIR, f)
2579 for f in os.listdir(TRACES_DIR)
2580 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2581 and not f.startswith('tmp'))
2582 ])
2583 traces_to_delete = traces[:-MAX_TRACES]
2584 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002585 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002586 except OSError:
2587 print('WARNING: Failed to remove old git traces from\n'
2588 ' %s'
2589 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002590
Edward Lemur5737f022019-05-17 01:24:00 +00002591 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002592 """Zip and write the git push traces stored in traces_dir."""
2593 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002594 traces_zip = trace_name + '-traces'
2595 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002596 # Create a temporary dir to store git config and gitcookies in. It will be
2597 # compressed and stored next to the traces.
2598 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002599 git_info_zip = trace_name + '-git-info'
2600
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002601 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002602
Edward Lemur1b52d872019-05-09 21:12:12 +00002603 git_push_metadata['trace_name'] = trace_name
2604 gclient_utils.FileWrite(
2605 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2606
2607 # Keep only the first 6 characters of the git hashes on the packet
2608 # trace. This greatly decreases size after compression.
2609 packet_traces = os.path.join(traces_dir, 'trace-packet')
2610 if os.path.isfile(packet_traces):
2611 contents = gclient_utils.FileRead(packet_traces)
2612 gclient_utils.FileWrite(
2613 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2614 shutil.make_archive(traces_zip, 'zip', traces_dir)
2615
2616 # Collect and compress the git config and gitcookies.
2617 git_config = RunGit(['config', '-l'])
2618 gclient_utils.FileWrite(
2619 os.path.join(git_info_dir, 'git-config'),
2620 git_config)
2621
2622 cookie_auth = gerrit_util.Authenticator.get()
2623 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2624 gitcookies_path = cookie_auth.get_gitcookies_path()
2625 if os.path.isfile(gitcookies_path):
2626 gitcookies = gclient_utils.FileRead(gitcookies_path)
2627 gclient_utils.FileWrite(
2628 os.path.join(git_info_dir, 'gitcookies'),
2629 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2630 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2631
Edward Lemur1b52d872019-05-09 21:12:12 +00002632 gclient_utils.rmtree(git_info_dir)
2633
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002634 def _RunGitPushWithTraces(self,
2635 refspec,
2636 refspec_opts,
2637 git_push_metadata,
2638 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002639 """Run git push and collect the traces resulting from the execution."""
2640 # Create a temporary directory to store traces in. Traces will be compressed
2641 # and stored in a 'traces' dir inside depot_tools.
2642 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002643 trace_name = os.path.join(
2644 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002645
2646 env = os.environ.copy()
2647 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2648 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002649 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002650 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2651 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2652 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2653
2654 try:
2655 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002656 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002657 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002658 push_cmd = ['git', 'push', remote_url, refspec]
2659 if git_push_options:
2660 for opt in git_push_options:
2661 push_cmd.extend(['-o', opt])
2662
Edward Lemur0f58ae42019-04-30 17:24:12 +00002663 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002664 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002665 env=env,
2666 print_stdout=True,
2667 # Flush after every line: useful for seeing progress when running as
2668 # recipe.
2669 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002670 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002671 except subprocess2.CalledProcessError as e:
2672 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002673 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002674 raise GitPushError(
2675 'Failed to create a change, very likely due to blocked keyword. '
2676 'Please examine output above for the reason of the failure.\n'
2677 'If this is a false positive, you can try to bypass blocked '
2678 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002679 '-o banned-words~skip, e.g.:\n'
2680 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002681 'If git-cl is not working correctly, file a bug under the '
2682 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002683 if 'git push -o nokeycheck' in str(e.stdout):
2684 raise GitPushError(
2685 'Failed to create a change, very likely due to a private key being '
2686 'detected. Please examine output above for the reason of the '
2687 'failure.\n'
2688 'If this is a false positive, you can try to bypass private key '
2689 'detection by using push option '
2690 '-o nokeycheck, e.g.:\n'
2691 'git cl upload -o nokeycheck\n\n'
2692 'If git-cl is not working correctly, file a bug under the '
2693 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002694
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002695 raise GitPushError(
2696 'Failed to create a change. Please examine output above for the '
2697 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002698 'For emergencies, Googlers can escalate to '
2699 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002700 'Hint: run command below to diagnose common Git/Gerrit '
2701 'credential problems:\n'
2702 ' git cl creds-check\n'
2703 '\n'
2704 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2705 'component including the files below.\n'
2706 'Review the files before upload, since they might contain sensitive '
2707 'information.\n'
2708 'Set the Restrict-View-Google label so that they are not publicly '
2709 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002710 finally:
2711 execution_time = time_time() - before_push
2712 metrics.collector.add_repeated('sub_commands', {
2713 'command': 'git push',
2714 'execution_time': execution_time,
2715 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002716 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002717 })
2718
Edward Lemur1b52d872019-05-09 21:12:12 +00002719 git_push_metadata['execution_time'] = execution_time
2720 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002721 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002722
Edward Lemur1b52d872019-05-09 21:12:12 +00002723 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002724 gclient_utils.rmtree(traces_dir)
2725
2726 return push_stdout
2727
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002728 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2729 change_desc):
2730 """Upload the current branch to Gerrit, retry if new remote HEAD is
2731 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002732 remote, remote_branch = self.GetRemoteBranch()
2733 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2734
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002735 try:
2736 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002737 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002738 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002739 # Repository might be in the middle of transition to main branch as
2740 # default, and uploads to old default might be blocked.
2741 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002742 DieWithError(str(e), change_desc)
2743
Josip Sokcevicb631a882021-01-06 18:18:10 +00002744 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2745 self.GetGerritProject())
2746 if project_head == branch:
2747 DieWithError(str(e), change_desc)
2748 branch = project_head
2749
2750 print("WARNING: Fetching remote state and retrying upload to default "
2751 "branch...")
2752 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002753 options.edit_description = False
2754 options.force = True
2755 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002756 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2757 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002758 except GitPushError as e:
2759 DieWithError(str(e), change_desc)
2760
2761 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002762 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002763 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002764 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002765 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002766 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002767 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002768 # User requested to change description
2769 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002770 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002771 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2772 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002773 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002774
2775 # Check if changes outside of this workspace have been uploaded.
2776 current_rev = change_detail['current_revision']
2777 last_uploaded_rev = self._GitGetBranchConfigValue(
2778 GERRIT_SQUASH_HASH_CONFIG_KEY)
2779 if last_uploaded_rev and current_rev != last_uploaded_rev:
2780 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002781 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002782 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002783 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002784 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002785 if len(change_ids) == 1:
2786 change_id = change_ids[0]
2787 else:
2788 change_id = GenerateGerritChangeId(change_desc.description)
2789 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002791 if options.preserve_tryjobs:
2792 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002793
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002794 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002795 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002796 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002797 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002798 with gclient_utils.temporary_file() as desc_tempfile:
2799 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2800 ref_to_push = RunGit(
2801 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002802 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002803 if options.no_add_changeid:
2804 pass
2805 else: # adding Change-Ids is okay.
2806 if not git_footers.get_footer_change_id(change_desc.description):
2807 DownloadGerritHook(False)
2808 change_desc.set_description(
2809 self._AddChangeIdToCommitMessage(change_desc.description,
2810 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002811 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002812 # For no-squash mode, we assume the remote called "origin" is the one we
2813 # want. It is not worthwhile to support different workflows for
2814 # no-squash mode.
2815 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002816 # attempt to extract the changeid from the current description
2817 # fail informatively if not possible.
2818 change_id_candidates = git_footers.get_footer_change_id(
2819 change_desc.description)
2820 if not change_id_candidates:
2821 DieWithError("Unable to extract change-id from message.")
2822 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002823
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002824 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002825 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2826 ref_to_push)]).splitlines()
2827 if len(commits) > 1:
2828 print('WARNING: This will upload %d commits. Run the following command '
2829 'to see which commits will be uploaded: ' % len(commits))
2830 print('git log %s..%s' % (parent, ref_to_push))
2831 print('You can also use `git squash-branch` to squash these into a '
2832 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002833 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002834
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002835 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002836 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002837 # Add default, watchlist, presubmit ccs if this is the initial upload
2838 # and CL is not private and auto-ccing has not been disabled.
2839 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002840 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002841 if len(cc) > 100:
2842 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2843 'process/lsc/lsc_workflow.md')
2844 print('WARNING: This will auto-CC %s users.' % len(cc))
2845 print('LSC may be more appropriate: %s' % lsc)
2846 print('You can also use the --no-autocc flag to disable auto-CC.')
2847 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002848 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002849 if options.cc:
2850 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002851 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002852 if change_desc.get_cced():
2853 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002854 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002855 valid_accounts = set(reviewers + cc)
2856 # TODO(crbug/877717): relax this for all hosts.
2857 else:
2858 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002859 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002860 logging.info('accounts %s are recognized, %s invalid',
2861 sorted(valid_accounts),
2862 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002863
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002864 # Extra options that can be specified at push time. Doc:
2865 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002866 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002867
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002868 for r in sorted(reviewers):
2869 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002870 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002871 reviewers.remove(r)
2872 else:
2873 # TODO(tandrii): this should probably be a hard failure.
2874 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2875 % r)
2876 for c in sorted(cc):
2877 # refspec option will be rejected if cc doesn't correspond to an
2878 # account, even though REST call to add such arbitrary cc may succeed.
2879 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002880 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002881 cc.remove(c)
2882
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002883 refspec_suffix = ''
2884 if refspec_opts:
2885 refspec_suffix = '%' + ','.join(refspec_opts)
2886 assert ' ' not in refspec_suffix, (
2887 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2888 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002889
Edward Lemur1b52d872019-05-09 21:12:12 +00002890 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002891 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002892 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002893 'change_id': change_id,
2894 'description': change_desc.description,
2895 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002896
Gavin Mak4e5e3992022-11-14 22:40:12 +00002897 # Gerrit may or may not update fast enough to return the correct patchset
2898 # number after we push. Get the pre-upload patchset and increment later.
2899 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2900
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002901 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002902 git_push_metadata,
2903 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002904
2905 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002906 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002907 change_numbers = [m.group(1)
2908 for m in map(regex.match, push_stdout.splitlines())
2909 if m]
2910 if len(change_numbers) != 1:
2911 DieWithError(
2912 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002913 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002914 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002915 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002916 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002917
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002918 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002919 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002920 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002921 gerrit_util.AddReviewers(self.GetGerritHost(),
2922 self._GerritChangeIdentifier(),
2923 reviewers,
2924 cc,
2925 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002926
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002927 return 0
2928
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002929 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2930 change_desc):
2931 """Computes parent of the generated commit to be uploaded to Gerrit.
2932
2933 Returns revision or a ref name.
2934 """
2935 if custom_cl_base:
2936 # Try to avoid creating additional unintended CLs when uploading, unless
2937 # user wants to take this risk.
2938 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2939 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2940 local_ref_of_target_remote])
2941 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002942 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002943 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2944 'If you proceed with upload, more than 1 CL may be created by '
2945 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2946 'If you are certain that specified base `%s` has already been '
2947 'uploaded to Gerrit as another CL, you may proceed.\n' %
2948 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2949 if not force:
2950 confirm_or_exit(
2951 'Do you take responsibility for cleaning up potential mess '
2952 'resulting from proceeding with upload?',
2953 action='upload')
2954 return custom_cl_base
2955
Aaron Gablef97e33d2017-03-30 15:44:27 -07002956 if remote != '.':
2957 return self.GetCommonAncestorWithUpstream()
2958
2959 # If our upstream branch is local, we base our squashed commit on its
2960 # squashed version.
2961 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2962
Aaron Gablef97e33d2017-03-30 15:44:27 -07002963 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002964 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002965 if upstream_branch_name == 'main':
2966 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002967
2968 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002969 # TODO(tandrii): consider checking parent change in Gerrit and using its
2970 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2971 # the tree hash of the parent branch. The upside is less likely bogus
2972 # requests to reupload parent change just because it's uploadhash is
2973 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002974 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2975 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002976 # Verify that the upstream branch has been uploaded too, otherwise
2977 # Gerrit will create additional CLs when uploading.
2978 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2979 RunGitSilent(['rev-parse', parent + ':'])):
2980 DieWithError(
2981 '\nUpload upstream branch %s first.\n'
2982 'It is likely that this branch has been rebased since its last '
2983 'upload, so you just need to upload it again.\n'
2984 '(If you uploaded it with --no-squash, then branch dependencies '
2985 'are not supported, and you should reupload with --squash.)'
2986 % upstream_branch_name,
2987 change_desc)
2988 return parent
2989
Gavin Mak4e5e3992022-11-14 22:40:12 +00002990 def _UpdateWithExternalChanges(self):
2991 """Updates workspace with external changes.
2992
2993 Returns the commit hash that should be used as the merge base on upload.
2994 """
2995 local_ps = self.GetPatchset()
2996 if local_ps is None:
2997 return
2998
2999 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00003000 if external_ps is None or local_ps == external_ps or \
3001 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003002 return
3003
3004 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00003005 if num_changes > 1:
3006 change_words = 'changes were'
3007 else:
3008 change_words = 'change was'
3009 print('\n%d external %s published to %s:\n' %
3010 (num_changes, change_words, self.GetIssueURL(short=True)))
3011
3012 # Print an overview of external changes.
3013 ps_to_commit = {}
3014 ps_to_info = {}
3015 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
3016 for commit_id, revision_info in revisions.get('revisions', {}).items():
3017 ps_num = revision_info['_number']
3018 ps_to_commit[ps_num] = commit_id
3019 ps_to_info[ps_num] = revision_info
3020
3021 for ps in range(external_ps, local_ps, -1):
3022 commit = ps_to_commit[ps][:8]
3023 desc = ps_to_info[ps].get('description', '')
3024 print('Patchset %d [%s] %s' % (ps, commit, desc))
3025
3026 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3027 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003028 return
3029
3030 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3031 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3032 external_base = external_parent['commit']
3033
3034 branch = git_common.current_branch()
3035 local_base = self.GetCommonAncestorWithUpstream()
3036 if local_base != external_base:
3037 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3038 (local_base, external_base))
3039 if git_common.upstream(branch):
3040 DieWithError('Upstream branch set. Consider using `git rebase-update` '
3041 'to make these the same.')
3042 print('No upstream branch set. Consider setting it and using '
3043 '`git rebase-update`.\nContinuing upload with Gerrit merge base.')
3044
3045 # Fetch Gerrit's CL base if it doesn't exist locally.
3046 remote, _ = self.GetRemoteBranch()
3047 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3048 RunGitSilent(['fetch', remote, external_base])
3049
3050 # Get the diff between local_ps and external_ps.
3051 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003052 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003053 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3054 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3055 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3056 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3057 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3058
3059 # Diff can be empty in the case of trivial rebases.
3060 if not diff:
3061 return external_base
3062
3063 # Apply the diff.
3064 with gclient_utils.temporary_file() as diff_tempfile:
3065 gclient_utils.FileWrite(diff_tempfile, diff)
3066 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3067 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3068 if not clean_patch:
3069 # Normally patchset is set after upload. But because we exit, that never
3070 # happens. Updating here makes sure that subsequent uploads don't need
3071 # to fetch/apply the same diff again.
3072 self.SetPatchset(external_ps)
3073 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3074 'conflicts and reupload.')
3075
3076 message = 'Incorporate external changes from '
3077 if num_changes == 1:
3078 message += 'patchset %d' % external_ps
3079 else:
3080 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3081 RunGitSilent(['commit', '-am', message])
3082 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3083 # patchset title instead of this 'Incorporate' message.
3084 return external_base
3085
Edward Lemura12175c2020-03-09 16:58:26 +00003086 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003087 """Re-commits using the current message, assumes the commit hook is in
3088 place.
3089 """
Edward Lemura12175c2020-03-09 16:58:26 +00003090 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003091 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003092 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003093 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003094 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003095
3096 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003097
tandriie113dfd2016-10-11 10:20:12 -07003098 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003099 try:
3100 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003101 except GerritChangeNotExists:
3102 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003103
3104 if data['status'] in ('ABANDONED', 'MERGED'):
3105 return 'CL %s is closed' % self.GetIssue()
3106
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003107 def GetGerritChange(self, patchset=None):
3108 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003109 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003110 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003111 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003112 data = self._GetChangeDetail(['ALL_REVISIONS'])
3113
3114 assert host and issue and patchset, 'CL must be uploaded first'
3115
3116 has_patchset = any(
3117 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003118 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003119 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003120 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003121 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003122
tandrii8c5a3532016-11-04 07:52:02 -07003123 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003124 'host': host,
3125 'change': issue,
3126 'project': data['project'],
3127 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003128 }
tandriie113dfd2016-10-11 10:20:12 -07003129
tandriide281ae2016-10-12 06:02:30 -07003130 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003131 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003132
Edward Lemur707d70b2018-02-07 00:50:14 +01003133 def GetReviewers(self):
3134 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003135 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003136
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003137
Lei Zhang8a0efc12020-08-05 19:58:45 +00003138def _get_bug_line_values(default_project_prefix, bugs):
3139 """Given default_project_prefix and comma separated list of bugs, yields bug
3140 line values.
tandriif9aefb72016-07-01 09:06:51 -07003141
3142 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003143 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003144 * string, which is left as is.
3145
3146 This function may produce more than one line, because bugdroid expects one
3147 project per line.
3148
Lei Zhang8a0efc12020-08-05 19:58:45 +00003149 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003150 ['v8:123', 'chromium:789']
3151 """
3152 default_bugs = []
3153 others = []
3154 for bug in bugs.split(','):
3155 bug = bug.strip()
3156 if bug:
3157 try:
3158 default_bugs.append(int(bug))
3159 except ValueError:
3160 others.append(bug)
3161
3162 if default_bugs:
3163 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003164 if default_project_prefix:
3165 if not default_project_prefix.endswith(':'):
3166 default_project_prefix += ':'
3167 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003168 else:
3169 yield default_bugs
3170 for other in sorted(others):
3171 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3172 yield other
3173
3174
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003175class ChangeDescription(object):
3176 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003177 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003178 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003179 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003180 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003181 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003182 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3183 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003184 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003185 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003186
Dan Beamd8b04ca2019-10-10 21:23:26 +00003187 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003188 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003189 if bug:
3190 regexp = re.compile(self.BUG_LINE)
3191 prefix = settings.GetBugPrefix()
3192 if not any((regexp.match(line) for line in self._description_lines)):
3193 values = list(_get_bug_line_values(prefix, bug))
3194 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003195 if fixed:
3196 regexp = re.compile(self.FIXED_LINE)
3197 prefix = settings.GetBugPrefix()
3198 if not any((regexp.match(line) for line in self._description_lines)):
3199 values = list(_get_bug_line_values(prefix, fixed))
3200 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003201
agable@chromium.org42c20792013-09-12 17:34:49 +00003202 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003203 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003204 return '\n'.join(self._description_lines)
3205
3206 def set_description(self, desc):
3207 if isinstance(desc, basestring):
3208 lines = desc.splitlines()
3209 else:
3210 lines = [line.rstrip() for line in desc]
3211 while lines and not lines[0]:
3212 lines.pop(0)
3213 while lines and not lines[-1]:
3214 lines.pop(-1)
3215 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003216
Edward Lemur5a644f82020-03-18 16:44:57 +00003217 def ensure_change_id(self, change_id):
3218 description = self.description
3219 footer_change_ids = git_footers.get_footer_change_id(description)
3220 # Make sure that the Change-Id in the description matches the given one.
3221 if footer_change_ids != [change_id]:
3222 if footer_change_ids:
3223 # Remove any existing Change-Id footers since they don't match the
3224 # expected change_id footer.
3225 description = git_footers.remove_footer(description, 'Change-Id')
3226 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3227 'if you want to set a new one.')
3228 # Add the expected Change-Id footer.
3229 description = git_footers.add_footer_change_id(description, change_id)
3230 self.set_description(description)
3231
Joanna Wang39811b12023-01-20 23:09:48 +00003232 def update_reviewers(self, reviewers):
3233 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003234
3235 Args:
3236 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003237 """
Joanna Wang39811b12023-01-20 23:09:48 +00003238 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003239 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003240
3241 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242
Joanna Wang39811b12023-01-20 23:09:48 +00003243 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003244 regexp = re.compile(self.R_LINE)
3245 matches = [regexp.match(line) for line in self._description_lines]
3246 new_desc = [l for i, l in enumerate(self._description_lines)
3247 if not matches[i]]
3248 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003249
Joanna Wang39811b12023-01-20 23:09:48 +00003250 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003251
Joanna Wang39811b12023-01-20 23:09:48 +00003252 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003253 for match in matches:
3254 if not match:
3255 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003256 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003257
Joanna Wang39811b12023-01-20 23:09:48 +00003258 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003259
3260 # Put the new lines in the description where the old first R= line was.
3261 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3262 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003263 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003264 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003265 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003266
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003267 def set_preserve_tryjobs(self):
3268 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3269 footers = git_footers.parse_footers(self.description)
3270 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3271 if v.lower() == 'true':
3272 return
3273 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3274
Anthony Polito8b955342019-09-24 19:01:36 +00003275 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003276 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003277 self.set_description([
3278 '# Enter a description of the change.',
3279 '# This will be displayed on the codereview site.',
3280 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003281 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003282 '--------------------',
3283 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003284 bug_regexp = re.compile(self.BUG_LINE)
3285 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003286 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003287 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003288
Dan Beamd8b04ca2019-10-10 21:23:26 +00003289 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003290 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003291
Bruce Dawsonfc487042020-10-27 19:11:37 +00003292 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003293 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003294 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003295 if not content:
3296 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003297 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003298
Bruce Dawson2377b012018-01-11 16:46:49 -08003299 # Strip off comments and default inserted "Bug:" line.
3300 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003301 (line.startswith('#') or
3302 line.rstrip() == "Bug:" or
3303 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003304 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003305 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003307
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003308 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003309 """Adds a footer line to the description.
3310
3311 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3312 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3313 that Gerrit footers are always at the end.
3314 """
3315 parsed_footer_line = git_footers.parse_footer(line)
3316 if parsed_footer_line:
3317 # Line is a gerrit footer in the form: Footer-Key: any value.
3318 # Thus, must be appended observing Gerrit footer rules.
3319 self.set_description(
3320 git_footers.add_footer(self.description,
3321 key=parsed_footer_line[0],
3322 value=parsed_footer_line[1]))
3323 return
3324
3325 if not self._description_lines:
3326 self._description_lines.append(line)
3327 return
3328
3329 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3330 if gerrit_footers:
3331 # git_footers.split_footers ensures that there is an empty line before
3332 # actual (gerrit) footers, if any. We have to keep it that way.
3333 assert top_lines and top_lines[-1] == ''
3334 top_lines, separator = top_lines[:-1], top_lines[-1:]
3335 else:
3336 separator = [] # No need for separator if there are no gerrit_footers.
3337
3338 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003339 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3340 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003341 top_lines.append('')
3342 top_lines.append(line)
3343 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003344
tandrii99a72f22016-08-17 14:33:24 -07003345 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003346 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003347 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003348 reviewers = [match.group(2).strip()
3349 for match in matches
3350 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003351 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003352
bradnelsond975b302016-10-23 12:20:23 -07003353 def get_cced(self):
3354 """Retrieves the list of reviewers."""
3355 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3356 cced = [match.group(2).strip() for match in matches if match]
3357 return cleanup_list(cced)
3358
Nodir Turakulov23b82142017-11-16 11:04:25 -08003359 def get_hash_tags(self):
3360 """Extracts and sanitizes a list of Gerrit hashtags."""
3361 subject = (self._description_lines or ('',))[0]
3362 subject = re.sub(
3363 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3364
3365 tags = []
3366 start = 0
3367 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3368 while True:
3369 m = bracket_exp.match(subject, start)
3370 if not m:
3371 break
3372 tags.append(self.sanitize_hash_tag(m.group(1)))
3373 start = m.end()
3374
3375 if not tags:
3376 # Try "Tag: " prefix.
3377 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3378 if m:
3379 tags.append(self.sanitize_hash_tag(m.group(1)))
3380 return tags
3381
3382 @classmethod
3383 def sanitize_hash_tag(cls, tag):
3384 """Returns a sanitized Gerrit hash tag.
3385
3386 A sanitized hashtag can be used as a git push refspec parameter value.
3387 """
3388 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3389
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003390
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003391def FindCodereviewSettingsFile(filename='codereview.settings'):
3392 """Finds the given file starting in the cwd and going up.
3393
3394 Only looks up to the top of the repository unless an
3395 'inherit-review-settings-ok' file exists in the root of the repository.
3396 """
3397 inherit_ok_file = 'inherit-review-settings-ok'
3398 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003399 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003400 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003401 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003402 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003403 if os.path.isfile(os.path.join(cwd, filename)):
3404 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003405 if cwd == root:
3406 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003407 parent_dir = os.path.dirname(cwd)
3408 if parent_dir == cwd:
3409 # We hit the system root directory.
3410 break
3411 cwd = parent_dir
3412 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003413
3414
3415def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003416 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003417 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003418
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003419 def SetProperty(name, setting, unset_error_ok=False):
3420 fullname = 'rietveld.' + name
3421 if setting in keyvals:
3422 RunGit(['config', fullname, keyvals[setting]])
3423 else:
3424 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3425
tandrii48df5812016-10-17 03:55:37 -07003426 if not keyvals.get('GERRIT_HOST', False):
3427 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003428 # Only server setting is required. Other settings can be absent.
3429 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003430 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003431 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3432 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003433 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003434 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3435 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003436 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3437 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003438 SetProperty(
3439 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003440 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003441
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003442 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003443 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003444
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003445 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003446 RunGit(['config', 'gerrit.squash-uploads',
3447 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003448
tandrii@chromium.org28253532016-04-14 13:46:56 +00003449 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003450 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003451 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3452
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003453 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003454 # should be of the form
3455 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3456 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003457 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3458 keyvals['ORIGIN_URL_CONFIG']])
3459
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003460
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003461def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003462 """Downloads a network object to a local file, like urllib.urlretrieve.
3463
3464 This is necessary because urllib is broken for SSL connections via a proxy.
3465 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003466 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003467 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003468
3469
ukai@chromium.org712d6102013-11-27 00:52:58 +00003470def hasSheBang(fname):
3471 """Checks fname is a #! script."""
3472 with open(fname) as f:
3473 return f.read(2).startswith('#!')
3474
3475
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003476def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003477 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003478
3479 Args:
3480 force: True to update hooks. False to install hooks if not present.
3481 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003482 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003483 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3484 if not os.access(dst, os.X_OK):
3485 if os.path.exists(dst):
3486 if not force:
3487 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003488 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003489 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003490 if not hasSheBang(dst):
3491 DieWithError('Not a script: %s\n'
3492 'You need to download from\n%s\n'
3493 'into .git/hooks/commit-msg and '
3494 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003495 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3496 except Exception:
3497 if os.path.exists(dst):
3498 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003499 DieWithError('\nFailed to download hooks.\n'
3500 'You need to download from\n%s\n'
3501 'into .git/hooks/commit-msg and '
3502 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003503
3504
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003505class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003506 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003507
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003508 def __init__(self):
3509 # Cached list of [host, identity, source], where source is either
3510 # .gitcookies or .netrc.
3511 self._all_hosts = None
3512
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003513 def ensure_configured_gitcookies(self):
3514 """Runs checks and suggests fixes to make git use .gitcookies from default
3515 path."""
3516 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3517 configured_path = RunGitSilent(
3518 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003519 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003520 if configured_path:
3521 self._ensure_default_gitcookies_path(configured_path, default)
3522 else:
3523 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003524
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003525 @staticmethod
3526 def _ensure_default_gitcookies_path(configured_path, default_path):
3527 assert configured_path
3528 if configured_path == default_path:
3529 print('git is already configured to use your .gitcookies from %s' %
3530 configured_path)
3531 return
3532
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003533 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003534 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3535 (configured_path, default_path))
3536
3537 if not os.path.exists(configured_path):
3538 print('However, your configured .gitcookies file is missing.')
3539 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3540 action='reconfigure')
3541 RunGit(['config', '--global', 'http.cookiefile', default_path])
3542 return
3543
3544 if os.path.exists(default_path):
3545 print('WARNING: default .gitcookies file already exists %s' %
3546 default_path)
3547 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3548 default_path)
3549
3550 confirm_or_exit('Move existing .gitcookies to default location?',
3551 action='move')
3552 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003553 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003554 print('Moved and reconfigured git to use .gitcookies from %s' %
3555 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003556
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003557 @staticmethod
3558 def _configure_gitcookies_path(default_path):
3559 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3560 if os.path.exists(netrc_path):
3561 print('You seem to be using outdated .netrc for git credentials: %s' %
3562 netrc_path)
3563 print('This tool will guide you through setting up recommended '
3564 '.gitcookies store for git credentials.\n'
3565 '\n'
3566 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3567 ' git config --global --unset http.cookiefile\n'
3568 ' mv %s %s.backup\n\n' % (default_path, default_path))
3569 confirm_or_exit(action='setup .gitcookies')
3570 RunGit(['config', '--global', 'http.cookiefile', default_path])
3571 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003572
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003573 def get_hosts_with_creds(self, include_netrc=False):
3574 if self._all_hosts is None:
3575 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003576 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3577 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3578 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3579 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003580
3581 if include_netrc:
3582 return self._all_hosts
3583 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3584
3585 def print_current_creds(self, include_netrc=False):
3586 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3587 if not hosts:
3588 print('No Git/Gerrit credentials found')
3589 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003590 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003591 header = [('Host', 'User', 'Which file'),
3592 ['=' * l for l in lengths]]
3593 for row in (header + hosts):
3594 print('\t'.join((('%%+%ds' % l) % s)
3595 for l, s in zip(lengths, row)))
3596
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003597 @staticmethod
3598 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003599 """Parses identity "git-<username>.domain" into <username> and domain."""
3600 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003601 # distinguishable from sub-domains. But we do know typical domains:
3602 if identity.endswith('.chromium.org'):
3603 domain = 'chromium.org'
3604 username = identity[:-len('.chromium.org')]
3605 else:
3606 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003607 if username.startswith('git-'):
3608 username = username[len('git-'):]
3609 return username, domain
3610
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003611 def has_generic_host(self):
3612 """Returns whether generic .googlesource.com has been configured.
3613
3614 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3615 """
3616 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003617 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003618 return True
3619 return False
3620
3621 def _get_git_gerrit_identity_pairs(self):
3622 """Returns map from canonic host to pair of identities (Git, Gerrit).
3623
3624 One of identities might be None, meaning not configured.
3625 """
3626 host_to_identity_pairs = {}
3627 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003628 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003629 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3630 idx = 0 if canonical == host else 1
3631 pair[idx] = identity
3632 return host_to_identity_pairs
3633
3634 def get_partially_configured_hosts(self):
3635 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003636 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003637 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003638 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003639
3640 def get_conflicting_hosts(self):
3641 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003642 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003643 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003644 if None not in (i1, i2) and i1 != i2)
3645
3646 def get_duplicated_hosts(self):
3647 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003648 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003649
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003650
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003651 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003652 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003653 hosts = sorted(hosts)
3654 assert hosts
3655 if extra_column_func is None:
3656 extras = [''] * len(hosts)
3657 else:
3658 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003659 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3660 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003661 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003662 lines.append(tmpl % he)
3663 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003664
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003665 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003666 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003667 yield ('.googlesource.com wildcard record detected',
3668 ['Chrome Infrastructure team recommends to list full host names '
3669 'explicitly.'],
3670 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003671
3672 dups = self.get_duplicated_hosts()
3673 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003674 yield ('The following hosts were defined twice',
3675 self._format_hosts(dups),
3676 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003677
3678 partial = self.get_partially_configured_hosts()
3679 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003680 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3681 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003682 self._format_hosts(
3683 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3684 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003685
3686 conflicting = self.get_conflicting_hosts()
3687 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003688 yield ('The following Git hosts have differing credentials from their '
3689 'Gerrit counterparts',
3690 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3691 tuple(self._get_git_gerrit_identity_pairs()[host])),
3692 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003693
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003694 def find_and_report_problems(self):
3695 """Returns True if there was at least one problem, else False."""
3696 found = False
3697 bad_hosts = set()
3698 for title, sublines, hosts in self._find_problems():
3699 if not found:
3700 found = True
3701 print('\n\n.gitcookies problem report:\n')
3702 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003703 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003704 if sublines:
3705 print()
3706 print(' %s' % '\n '.join(sublines))
3707 print()
3708
3709 if bad_hosts:
3710 assert found
3711 print(' You can manually remove corresponding lines in your %s file and '
3712 'visit the following URLs with correct account to generate '
3713 'correct credential lines:\n' %
3714 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003715 print(' %s' % '\n '.join(
3716 sorted(
3717 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3718 _canonical_git_googlesource_host(host))
3719 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003720 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003721
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003723@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003724def CMDcreds_check(parser, args):
3725 """Checks credentials and suggests changes."""
3726 _, _ = parser.parse_args(args)
3727
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003728 # Code below checks .gitcookies. Abort if using something else.
3729 authn = gerrit_util.Authenticator.get()
3730 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003731 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003732 'This command is not designed for bot environment. It checks '
3733 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003734 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3735 if isinstance(authn, gerrit_util.GceAuthenticator):
3736 message += (
3737 '\n'
3738 'If you need to run this on GCE or a cloudtop instance, '
3739 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3740 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003741
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003742 checker = _GitCookiesChecker()
3743 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003744
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003745 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003746 checker.print_current_creds(include_netrc=True)
3747
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003748 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003749 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003750 return 0
3751 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003752
3753
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003754@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003755def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003756 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003757 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003758 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003759 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003760 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003761 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003762 return RunGit(['config', 'branch.%s.base-url' % branch],
3763 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003764
3765 print('Setting base-url to %s' % args[0])
3766 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3767 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003768
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003769
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003770def color_for_status(status):
3771 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003772 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003773 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003774 'unsent': BOLD + Fore.YELLOW,
3775 'waiting': BOLD + Fore.RED,
3776 'reply': BOLD + Fore.YELLOW,
3777 'not lgtm': BOLD + Fore.RED,
3778 'lgtm': BOLD + Fore.GREEN,
3779 'commit': BOLD + Fore.MAGENTA,
3780 'closed': BOLD + Fore.CYAN,
3781 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003782 }.get(status, Fore.WHITE)
3783
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003784
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003785def get_cl_statuses(changes, fine_grained, max_processes=None):
3786 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003787
3788 If fine_grained is true, this will fetch CL statuses from the server.
3789 Otherwise, simply indicate if there's a matching url for the given branches.
3790
3791 If max_processes is specified, it is used as the maximum number of processes
3792 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3793 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003794
3795 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003796 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003797 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003798 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003799
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003800 if not fine_grained:
3801 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003802 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003803 for cl in changes:
3804 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003805 return
3806
3807 # First, sort out authentication issues.
3808 logging.debug('ensuring credentials exist')
3809 for cl in changes:
3810 cl.EnsureAuthenticated(force=False, refresh=True)
3811
3812 def fetch(cl):
3813 try:
3814 return (cl, cl.GetStatus())
3815 except:
3816 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003817 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003818 raise
3819
3820 threads_count = len(changes)
3821 if max_processes:
3822 threads_count = max(1, min(threads_count, max_processes))
3823 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3824
Edward Lemur61bf4172020-02-24 23:22:37 +00003825 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003826 fetched_cls = set()
3827 try:
3828 it = pool.imap_unordered(fetch, changes).__iter__()
3829 while True:
3830 try:
3831 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003832 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003833 break
3834 fetched_cls.add(cl)
3835 yield cl, status
3836 finally:
3837 pool.close()
3838
3839 # Add any branches that failed to fetch.
3840 for cl in set(changes) - fetched_cls:
3841 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003842
rmistry@google.com2dd99862015-06-22 12:22:18 +00003843
Jose Lopes3863fc52020-04-07 17:00:25 +00003844def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003845 """Uploads CLs of local branches that are dependents of the current branch.
3846
3847 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003848
3849 test1 -> test2.1 -> test3.1
3850 -> test3.2
3851 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003852
3853 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3854 run on the dependent branches in this order:
3855 test2.1, test3.1, test3.2, test2.2, test3.3
3856
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003857 Note: This function does not rebase your local dependent branches. Use it
3858 when you make a change to the parent branch that will not conflict
3859 with its dependent branches, and you would like their dependencies
3860 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003861 """
3862 if git_common.is_dirty_git_tree('upload-branch-deps'):
3863 return 1
3864
3865 root_branch = cl.GetBranch()
3866 if root_branch is None:
3867 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3868 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003869 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003870 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3871 'patchset dependencies without an uploaded CL.')
3872
3873 branches = RunGit(['for-each-ref',
3874 '--format=%(refname:short) %(upstream:short)',
3875 'refs/heads'])
3876 if not branches:
3877 print('No local branches found.')
3878 return 0
3879
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003880 # Create a dictionary of all local branches to the branches that are
3881 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003882 tracked_to_dependents = collections.defaultdict(list)
3883 for b in branches.splitlines():
3884 tokens = b.split()
3885 if len(tokens) == 2:
3886 branch_name, tracked = tokens
3887 tracked_to_dependents[tracked].append(branch_name)
3888
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print()
3890 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003891 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003892
rmistry@google.com2dd99862015-06-22 12:22:18 +00003893 def traverse_dependents_preorder(branch, padding=''):
3894 dependents_to_process = tracked_to_dependents.get(branch, [])
3895 padding += ' '
3896 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003897 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 dependents.append(dependent)
3899 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003900
rmistry@google.com2dd99862015-06-22 12:22:18 +00003901 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903
3904 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003905 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003906 return 0
3907
rmistry@google.com2dd99862015-06-22 12:22:18 +00003908 # Record all dependents that failed to upload.
3909 failures = {}
3910 # Go through all dependents, checkout the branch and upload.
3911 try:
3912 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003913 print()
3914 print('--------------------------------------')
3915 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003916 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003917 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003918 try:
3919 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003920 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003921 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003922 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003923 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003924 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003925 finally:
3926 # Swap back to the original root branch.
3927 RunGit(['checkout', '-q', root_branch])
3928
vapiera7fbd5a2016-06-16 09:17:49 -07003929 print()
3930 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003931 for dependent_branch in dependents:
3932 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003933 print(' %s : %s' % (dependent_branch, upload_status))
3934 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003935
3936 return 0
3937
3938
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003939def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003940 """Given a proposed tag name, returns a tag name that is guaranteed to be
3941 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3942 or 'foo-3', and so on."""
3943
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003944 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003945 for suffix_num in itertools.count(1):
3946 if suffix_num == 1:
3947 to_check = proposed_tag
3948 else:
3949 to_check = '%s-%d' % (proposed_tag, suffix_num)
3950
3951 if to_check not in existing_tags:
3952 return to_check
3953
3954
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003955@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003956def CMDarchive(parser, args):
3957 """Archives and deletes branches associated with closed changelists."""
3958 parser.add_option(
3959 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003960 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003961 parser.add_option(
3962 '-f', '--force', action='store_true',
3963 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003964 parser.add_option(
3965 '-d', '--dry-run', action='store_true',
3966 help='Skip the branch tagging and removal steps.')
3967 parser.add_option(
3968 '-t', '--notags', action='store_true',
3969 help='Do not tag archived branches. '
3970 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003971 parser.add_option(
3972 '-p',
3973 '--pattern',
3974 default='git-cl-archived-{issue}-{branch}',
3975 help='Format string for archive tags. '
3976 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003977
kmarshall3bff56b2016-06-06 18:31:47 -07003978 options, args = parser.parse_args(args)
3979 if args:
3980 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003981
3982 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3983 if not branches:
3984 return 0
3985
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003986 tags = RunGit(['for-each-ref', '--format=%(refname)',
3987 'refs/tags']).splitlines() or []
3988 tags = [t.split('/')[-1] for t in tags]
3989
vapiera7fbd5a2016-06-16 09:17:49 -07003990 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003991 changes = [Changelist(branchref=b)
3992 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003993 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3994 statuses = get_cl_statuses(changes,
3995 fine_grained=True,
3996 max_processes=options.maxjobs)
3997 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003998 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3999 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07004000 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004001 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004002 proposal.sort()
4003
4004 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004005 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004006 return 0
4007
Edward Lemur85153282020-02-14 22:06:29 +00004008 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07004009
vapiera7fbd5a2016-06-16 09:17:49 -07004010 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004011 if options.notags:
4012 for next_item in proposal:
4013 print(' ' + next_item[0])
4014 else:
4015 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4016 for next_item in proposal:
4017 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004018
kmarshall9249e012016-08-23 12:02:16 -07004019 # Quit now on precondition failure or if instructed by the user, either
4020 # via an interactive prompt or by command line flags.
4021 if options.dry_run:
4022 print('\nNo changes were made (dry run).\n')
4023 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004024
4025 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004026 print('You are currently on a branch \'%s\' which is associated with a '
4027 'closed codereview issue, so archive cannot proceed. Please '
4028 'checkout another branch and run this command again.' %
4029 current_branch)
4030 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004031
4032 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004033 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004034 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004035 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004036 return 1
4037
4038 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004039 if not options.notags:
4040 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004041
4042 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4043 # Clean up the tag if we failed to delete the branch.
4044 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004045
vapiera7fbd5a2016-06-16 09:17:49 -07004046 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004047
4048 return 0
4049
4050
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004051@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004052def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004053 """Show status of changelists.
4054
4055 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004056 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004057 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004058 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004059 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004060 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004061 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004062 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004063
4064 Also see 'git cl comments'.
4065 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004066 parser.add_option(
4067 '--no-branch-color',
4068 action='store_true',
4069 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004071 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004072 parser.add_option('-f', '--fast', action='store_true',
4073 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004074 parser.add_option(
4075 '-j', '--maxjobs', action='store', type=int,
4076 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004077 parser.add_option(
4078 '-i', '--issue', type=int,
4079 help='Operate on this issue instead of the current branch\'s implicit '
4080 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004081 parser.add_option('-d',
4082 '--date-order',
4083 action='store_true',
4084 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004085 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004086 if args:
4087 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004088
iannuccie53c9352016-08-17 14:40:40 -07004089 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004090 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004091
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004092 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004093 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004094 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004095 if cl.GetIssue():
4096 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004097 elif options.field == 'id':
4098 issueid = cl.GetIssue()
4099 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004100 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004101 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004102 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004104 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004105 elif options.field == 'status':
4106 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004107 elif options.field == 'url':
4108 url = cl.GetIssueURL()
4109 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004110 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004111 return 0
4112
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004113 branches = RunGit([
4114 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4115 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004116 if not branches:
4117 print('No local branch found.')
4118 return 0
4119
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004120 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004121 Changelist(branchref=b, commit_date=ct)
4122 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4123 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004124 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004125 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004126 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004127 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004128
Edward Lemur85153282020-02-14 22:06:29 +00004129 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004130
4131 def FormatBranchName(branch, colorize=False):
4132 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4133 an asterisk when it is the current branch."""
4134
4135 asterisk = ""
4136 color = Fore.RESET
4137 if branch == current_branch:
4138 asterisk = "* "
4139 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004140 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004141
4142 if colorize:
4143 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004144 return asterisk + branch_name
4145
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004146 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004147
4148 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004149
4150 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004151 sorted_changes = sorted(changes,
4152 key=lambda c: c.GetCommitDate(),
4153 reverse=True)
4154 else:
4155 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4156 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004157 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004158 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004159 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004160 branch_statuses[c.GetBranch()] = status
4161 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004162 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004163 if url and (not status or status == 'error'):
4164 # The issue probably doesn't exist anymore.
4165 url += ' (broken)'
4166
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004167 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004168 # Turn off bold as well as colors.
4169 END = '\033[0m'
4170 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004171 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004172 color = ''
4173 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004174 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004175
Alan Cuttera3be9a52019-03-04 18:50:33 +00004176 branch_display = FormatBranchName(branch)
4177 padding = ' ' * (alignment - len(branch_display))
4178 if not options.no_branch_color:
4179 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004180
Alan Cuttera3be9a52019-03-04 18:50:33 +00004181 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4182 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004183
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004185 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004186 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004187 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004188 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004189 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004190 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004191 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004193 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004194 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004195 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196 return 0
4197
4198
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004199def colorize_CMDstatus_doc():
4200 """To be called once in main() to add colors to git cl status help."""
4201 colors = [i for i in dir(Fore) if i[0].isupper()]
4202
4203 def colorize_line(line):
4204 for color in colors:
4205 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004206 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004207 indent = len(line) - len(line.lstrip(' ')) + 1
4208 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4209 return line
4210
4211 lines = CMDstatus.__doc__.splitlines()
4212 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4213
4214
phajdan.jre328cf92016-08-22 04:12:17 -07004215def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004216 if path == '-':
4217 json.dump(contents, sys.stdout)
4218 else:
4219 with open(path, 'w') as f:
4220 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004221
4222
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004223@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004224@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004225def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004226 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004227
4228 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004229 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 parser.add_option('-r', '--reverse', action='store_true',
4231 help='Lookup the branch(es) for the specified issues. If '
4232 'no issues are specified, all branches with mapped '
4233 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004234 parser.add_option('--json',
4235 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004236 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004237
dnj@chromium.org406c4402015-03-03 17:22:28 +00004238 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004239 branches = RunGit(['for-each-ref', 'refs/heads',
4240 '--format=%(refname)']).splitlines()
4241 # Reverse issue lookup.
4242 issue_branch_map = {}
4243
4244 git_config = {}
4245 for config in RunGit(['config', '--get-regexp',
4246 r'branch\..*issue']).splitlines():
4247 name, _space, val = config.partition(' ')
4248 git_config[name] = val
4249
4250 for branch in branches:
4251 issue = git_config.get(
4252 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4253 if issue:
4254 issue_branch_map.setdefault(int(issue), []).append(branch)
4255 if not args:
4256 args = sorted(issue_branch_map.keys())
4257 result = {}
4258 for issue in args:
4259 try:
4260 issue_num = int(issue)
4261 except ValueError:
4262 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4263 continue
4264 result[issue_num] = issue_branch_map.get(issue_num)
4265 print('Branch for issue number %s: %s' %
4266 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4267 if options.json:
4268 write_json(options.json, result)
4269 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004270
4271 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004272 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004273 if not issue.valid:
4274 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4275 'or no argument to list it.\n'
4276 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004277 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004278 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004279 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004280 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004281 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4282 if options.json:
4283 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004284 'gerrit_host': cl.GetGerritHost(),
4285 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004286 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004287 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004288 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004289 return 0
4290
4291
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004292@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004293def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004294 """Shows or posts review comments for any changelist."""
4295 parser.add_option('-a', '--add-comment', dest='comment',
4296 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004297 parser.add_option('-p', '--publish', action='store_true',
4298 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004299 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004300 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004301 parser.add_option('-m', '--machine-readable', dest='readable',
4302 action='store_false', default=True,
4303 help='output comments in a format compatible with '
4304 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004305 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004306 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004308
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004309 issue = None
4310 if options.issue:
4311 try:
4312 issue = int(options.issue)
4313 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004314 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004315
Edward Lemur934836a2019-09-09 20:16:54 +00004316 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004317
4318 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004319 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004320 return 0
4321
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004322 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4323 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004324 for comment in summary:
4325 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004326 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004327 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004328 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004329 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004330 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004331 elif comment.autogenerated:
4332 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004333 else:
4334 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004335 print('\n%s%s %s%s\n%s' % (
4336 color,
4337 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4338 comment.sender,
4339 Fore.RESET,
4340 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4341
smut@google.comc85ac942015-09-15 16:34:43 +00004342 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004343 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004344 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004345 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4346 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004347 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004348 return 0
4349
4350
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004351@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004352@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004353def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004354 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004355 parser.add_option('-d', '--display', action='store_true',
4356 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004357 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004358 help='New description to set for this issue (- for stdin, '
4359 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004360 parser.add_option('-f', '--force', action='store_true',
4361 help='Delete any unpublished Gerrit edits for this issue '
4362 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004363
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004364 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004365
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004366 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004367 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004368 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004369 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004370 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004371
Edward Lemur934836a2019-09-09 20:16:54 +00004372 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004373 if target_issue_arg:
4374 kwargs['issue'] = target_issue_arg.issue
4375 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004376
4377 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004378 if not cl.GetIssue():
4379 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004380
Edward Lemur678a6842019-10-03 22:25:05 +00004381 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004382 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004383
Edward Lemur6c6827c2020-02-06 21:15:18 +00004384 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004385
smut@google.com34fb6b12015-07-13 20:03:26 +00004386 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004387 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004388 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004389
4390 if options.new_description:
4391 text = options.new_description
4392 if text == '-':
4393 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004394 elif text == '+':
4395 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004396 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004397
4398 description.set_description(text)
4399 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004400 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004401 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004402 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004403 return 0
4404
4405
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004406@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004407def CMDlint(parser, args):
4408 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004409 parser.add_option('--filter', action='append', metavar='-x,+y',
4410 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004411 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004412
4413 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004414 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004415 try:
4416 import cpplint
4417 import cpplint_chromium
4418 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004419 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004420 return 1
4421
4422 # Change the current working directory before calling lint so that it
4423 # shows the correct base.
4424 previous_cwd = os.getcwd()
4425 os.chdir(settings.GetRoot())
4426 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004427 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004428 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004429 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004430 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004431 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004432
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004433 # Process cpplint arguments, if any.
4434 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4435 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004436 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004437
Lei Zhang379d1ad2020-07-15 19:40:06 +00004438 include_regex = re.compile(settings.GetLintRegex())
4439 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004440 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4441 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004442 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004443 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004444 continue
4445
4446 if ignore_regex.match(filename):
4447 print('Ignoring file %s' % filename)
4448 continue
4449
4450 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4451 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004452 finally:
4453 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004454 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004455 if cpplint._cpplint_state.error_count != 0:
4456 return 1
4457 return 0
4458
4459
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004460@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004462 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004463 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004464 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004465 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004466 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004467 parser.add_option('--all', action='store_true',
4468 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004469 parser.add_option('--files',
4470 nargs=1,
4471 help='Semicolon-separated list of files to be marked as '
4472 'modified when executing presubmit or post-upload hooks. '
4473 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004474 parser.add_option('--parallel', action='store_true',
4475 help='Run all tests specified by input_api.RunTests in all '
4476 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004477 parser.add_option('--resultdb', action='store_true',
4478 help='Run presubmit checks in the ResultSink environment '
4479 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004480 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004481 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004482
sbc@chromium.org71437c02015-04-09 19:29:40 +00004483 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004484 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485 return 1
4486
Edward Lemur934836a2019-09-09 20:16:54 +00004487 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004488 if args:
4489 base_branch = args[0]
4490 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004491 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004492 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004493
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004494 start = time.time()
4495 try:
4496 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4497 description = cl.FetchDescription()
4498 else:
4499 description = _create_description_from_log([base_branch])
4500 except Exception as e:
4501 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004502 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004503 elapsed = time.time() - start
4504 if elapsed > 5:
4505 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004506
Bruce Dawson13acea32022-05-03 22:13:08 +00004507 if not base_branch:
4508 if not options.force:
4509 print('use --force to check even when not on a branch.')
4510 return 1
4511 base_branch = 'HEAD'
4512
Josip Sokcevic017544d2022-03-31 23:47:53 +00004513 cl.RunHook(committing=not options.upload,
4514 may_prompt=False,
4515 verbose=options.verbose,
4516 parallel=options.parallel,
4517 upstream=base_branch,
4518 description=description,
4519 all_files=options.all,
4520 files=options.files,
4521 resultdb=options.resultdb,
4522 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004523 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004524
4525
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004526def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004527 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004528
4529 Works the same way as
4530 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4531 but can be called on demand on all platforms.
4532
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004533 The basic idea is to generate git hash of a state of the tree, original
4534 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004535 """
4536 lines = []
4537 tree_hash = RunGitSilent(['write-tree'])
4538 lines.append('tree %s' % tree_hash.strip())
4539 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4540 if code == 0:
4541 lines.append('parent %s' % parent.strip())
4542 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4543 lines.append('author %s' % author.strip())
4544 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4545 lines.append('committer %s' % committer.strip())
4546 lines.append('')
4547 # Note: Gerrit's commit-hook actually cleans message of some lines and
4548 # whitespace. This code is not doing this, but it clearly won't decrease
4549 # entropy.
4550 lines.append(message)
4551 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004552 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004553 return 'I%s' % change_hash.strip()
4554
4555
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004556def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004557 """Computes the remote branch ref to use for the CL.
4558
4559 Args:
4560 remote (str): The git remote for the CL.
4561 remote_branch (str): The git remote branch for the CL.
4562 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004563 """
4564 if not (remote and remote_branch):
4565 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004566
wittman@chromium.org455dc922015-01-26 20:15:50 +00004567 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004568 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004569 # refs, which are then translated into the remote full symbolic refs
4570 # below.
4571 if '/' not in target_branch:
4572 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4573 else:
4574 prefix_replacements = (
4575 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4576 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4577 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4578 )
4579 match = None
4580 for regex, replacement in prefix_replacements:
4581 match = re.search(regex, target_branch)
4582 if match:
4583 remote_branch = target_branch.replace(match.group(0), replacement)
4584 break
4585 if not match:
4586 # This is a branch path but not one we recognize; use as-is.
4587 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004588 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004589 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004590 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004591 # Handle the refs that need to land in different refs.
4592 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004593
wittman@chromium.org455dc922015-01-26 20:15:50 +00004594 # Create the true path to the remote branch.
4595 # Does the following translation:
4596 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004597 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004598 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4599 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4600 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4601 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4602 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4603 'refs/heads/')
4604 elif remote_branch.startswith('refs/remotes/branch-heads'):
4605 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004606
wittman@chromium.org455dc922015-01-26 20:15:50 +00004607 return remote_branch
4608
4609
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004610def cleanup_list(l):
4611 """Fixes a list so that comma separated items are put as individual items.
4612
4613 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4614 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4615 """
4616 items = sum((i.split(',') for i in l), [])
4617 stripped_items = (i.strip() for i in items)
4618 return sorted(filter(None, stripped_items))
4619
4620
Aaron Gable4db38df2017-11-03 14:59:07 -07004621@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004622@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004623def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004624 """Uploads the current changelist to codereview.
4625
4626 Can skip dependency patchset uploads for a branch by running:
4627 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004628 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004629 git config --unset branch.branch_name.skip-deps-uploads
4630 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004631
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004632 If the name of the checked out branch starts with "bug-" or "fix-" followed
4633 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004634 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004635
4636 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004637 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004638 [git-cl] add support for hashtags
4639 Foo bar: implement foo
4640 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004641 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004642 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4643 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004644 parser.add_option('--bypass-watchlists', action='store_true',
4645 dest='bypass_watchlists',
4646 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004647 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004648 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004649 parser.add_option('--message', '-m', dest='message',
4650 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004651 parser.add_option('-b', '--bug',
4652 help='pre-populate the bug number(s) for this issue. '
4653 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004654 parser.add_option('--message-file', dest='message_file',
4655 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004656 parser.add_option('--title', '-t', dest='title',
4657 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004658 parser.add_option('-T', '--skip-title', action='store_true',
4659 dest='skip_title',
4660 help='Use the most recent commit message as the title of '
4661 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004662 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004663 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004664 help='reviewer email addresses')
4665 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004666 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004667 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004668 parser.add_option('--hashtag', dest='hashtags',
4669 action='append', default=[],
4670 help=('Gerrit hashtag for new CL; '
4671 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004672 parser.add_option('-s',
4673 '--send-mail',
4674 '--send-email',
4675 dest='send_mail',
4676 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004677 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004678 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004679 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004680 metavar='TARGET',
4681 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004682 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004683 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004684 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004685 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004686 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004687 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004688 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004689 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4690 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004691 parser.add_option('-c',
4692 '--use-commit-queue',
4693 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004694 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004695 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004696 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004697 parser.add_option('-d', '--cq-dry-run',
4698 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004699 help='Send the patchset to do a CQ dry run right after '
4700 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004701 parser.add_option(
4702 '-q',
4703 '--cq-quick-run',
4704 action='store_true',
4705 default=False,
4706 help='Send the patchset to do a CQ quick run right after '
4707 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4708 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004709 parser.add_option('--set-bot-commit', action='store_true',
4710 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004711 parser.add_option('--preserve-tryjobs', action='store_true',
4712 help='instruct the CQ to let tryjobs running even after '
4713 'new patchsets are uploaded instead of canceling '
4714 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004715 parser.add_option('--dependencies', action='store_true',
4716 help='Uploads CLs of all the local branches that depend on '
4717 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004718 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4719 help='Sends your change to the CQ after an approval. Only '
4720 'works on repos that have the Auto-Submit label '
4721 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004722 parser.add_option('--parallel', action='store_true',
4723 help='Run all tests specified by input_api.RunTests in all '
4724 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004725 parser.add_option('--no-autocc', action='store_true',
4726 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004727 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004728 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004729 parser.add_option('-R', '--retry-failed', action='store_true',
4730 help='Retry failed tryjobs from old patchset immediately '
4731 'after uploading new patchset. Cannot be used with '
4732 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004733 parser.add_option('--fixed', '-x',
4734 help='List of bugs that will be commented on and marked '
4735 'fixed (pre-populates "Fixed:" tag). Same format as '
4736 '-b option / "Bug:" tag. If fixing several issues, '
4737 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004738 parser.add_option('--edit-description', action='store_true', default=False,
4739 help='Modify description before upload. Cannot be used '
4740 'with --force. It is a noop when --no-squash is set '
4741 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004742 parser.add_option('--git-completion-helper', action="store_true",
4743 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004744 parser.add_option('-o',
4745 '--push-options',
4746 action='append',
4747 default=[],
4748 help='Transmit the given string to the server when '
4749 'performing git push (pass-through). See git-push '
4750 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004751 parser.add_option('--no-add-changeid',
4752 action='store_true',
4753 dest='no_add_changeid',
4754 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004755 parser.add_option('--no-python2-post-upload-hooks',
4756 action='store_true',
4757 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004758 parser.add_option('--cherry-pick-stacked',
4759 '--cp',
4760 dest='cherry_pick_stacked',
4761 action='store_true',
4762 help='If parent branch has un-uploaded updates, '
4763 'automatically skip parent branches and just upload '
4764 'the current branch cherry-pick on its parent\'s last '
4765 'uploaded commit. Allows users to skip the potential '
4766 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004767 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004768
rmistry@google.com2dd99862015-06-22 12:22:18 +00004769 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004770 (options, args) = parser.parse_args(args)
4771
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004772 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004773 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4774 if opt.help != optparse.SUPPRESS_HELP))
4775 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004776
sbc@chromium.org71437c02015-04-09 19:29:40 +00004777 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004778 return 1
4779
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004780 options.reviewers = cleanup_list(options.reviewers)
4781 options.cc = cleanup_list(options.cc)
4782
Josipe827b0f2020-01-30 00:07:20 +00004783 if options.edit_description and options.force:
4784 parser.error('Only one of --force and --edit-description allowed')
4785
tandriib80458a2016-06-23 12:20:07 -07004786 if options.message_file:
4787 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004788 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004789 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004790
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004791 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004792 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004793 options.use_commit_queue,
4794 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004795 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4796 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004797
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004798 if options.skip_title and options.title:
4799 parser.error('Only one of --title and --skip-title allowed.')
4800
Aaron Gableedbc4132017-09-11 13:22:28 -07004801 if options.use_commit_queue:
4802 options.send_mail = True
4803
Edward Lesmes0dd54822020-03-26 18:24:25 +00004804 if options.squash is None:
4805 # Load default for user, repo, squash=true, in this order.
4806 options.squash = settings.GetSquashGerritUploads()
4807
Joanna Wang5051ffe2023-03-01 22:24:07 +00004808 cl = Changelist(branchref=options.target_branch)
4809
4810 # Warm change details cache now to avoid RPCs later, reducing latency for
4811 # developers.
4812 if cl.GetIssue():
4813 cl._GetChangeDetail(
4814 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4815
4816 if options.retry_failed and not cl.GetIssue():
4817 print('No previous patchsets, so --retry-failed has no effect.')
4818 options.retry_failed = False
4819
4820 remote = cl.GetRemoteUrl()
Joanna Wang892f2ce2023-03-14 21:39:47 +00004821 dogfood_stacked_changes = (os.environ.get(DOGFOOD_STACKED_CHANGES_VAR)
Joanna Wang5051ffe2023-03-01 22:24:07 +00004822 not in ['1', '0']
4823 and any(repo in remote
4824 for repo in DOGFOOD_STACKED_CHANGES_REPOS))
4825
4826 if dogfood_stacked_changes:
4827 print('This repo has been enrolled in the stacked changes dogfood. '
4828 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4829 'File bugs at https://bit.ly/3Y6opoI')
4830
4831 if options.squash and (dogfood_stacked_changes
Joanna Wang892f2ce2023-03-14 21:39:47 +00004832 or os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'):
Brian Ryner8d19d862023-04-12 13:32:49 +00004833 print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4834 '"Set new changes to "work in progress" by default" checkbox at\n'
Joanna Wangd3cbd402023-04-10 16:51:57 +00004835 'https://<host>-review.googlesource.com/settings/')
Joanna Wangdd12deb2023-01-26 20:43:28 +00004836 if options.dependencies:
4837 parser.error('--dependencies is not available for this workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004838
Joanna Wangd75fc882023-03-01 21:53:34 +00004839 if options.cherry_pick_stacked:
4840 try:
4841 orig_args.remove('--cherry-pick-stacked')
4842 except ValueError:
4843 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004844 UploadAllSquashed(options, orig_args)
4845 return 0
4846
Joanna Wangd75fc882023-03-01 21:53:34 +00004847 if options.cherry_pick_stacked:
4848 parser.error('--cherry-pick-stacked is not available for this workflow.')
4849
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004850 # cl.GetMostRecentPatchset uses cached information, and can return the last
4851 # patchset before upload. Calling it here makes it clear that it's the
4852 # last patchset before upload. Note that GetMostRecentPatchset will fail
4853 # if no CL has been uploaded yet.
4854 if options.retry_failed:
4855 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004856
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004857 ret = cl.CMDUpload(options, args, orig_args)
4858
4859 if options.retry_failed:
4860 if ret != 0:
4861 print('Upload failed, so --retry-failed has no effect.')
4862 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004863 builds, _ = _fetch_latest_builds(cl,
4864 DEFAULT_BUILDBUCKET_HOST,
4865 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004866 jobs = _filter_failed_for_retry(builds)
4867 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004868 print('No failed tryjobs, so --retry-failed has no effect.')
4869 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004870 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004871
4872 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004873
4874
Joanna Wang18de1f62023-01-21 01:24:24 +00004875def UploadAllSquashed(options, orig_args):
4876 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4877 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004878 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004879
Joanna Wangc710e2d2023-01-25 14:53:22 +00004880 # Create commits.
4881 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4882 if cherry_pick_current:
4883 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4884 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4885 uploads_by_cl.append((cls[0], new_upload))
4886 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004887 ordered_cls = list(reversed(cls))
4888
Joanna Wang6215dd02023-02-07 15:58:03 +00004889 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004890 # We can only support external changes when we're only uploading one
4891 # branch.
4892 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004893 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004894 if parent is None:
4895 origin = '.'
4896 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004897
Joanna Wang7603f042023-03-01 22:17:36 +00004898 while origin == '.':
4899 # Search for cl's closest ancestor with a gerrit hash.
4900 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4901 if origin == '.':
4902 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4903
4904 # Support the `git merge` and `git pull` workflow.
4905 if upstream_branch in ['master', 'main']:
4906 parent = cl.GetCommonAncestorWithUpstream()
4907 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004908 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4909 upstream_branch,
4910 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004911 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4912 upstream_branch,
4913 GERRIT_SQUASH_HASH_CONFIG_KEY)
4914 if parent:
4915 break
4916 branch = upstream_branch
4917 else:
4918 # Either the root of the tree is the cl's direct parent and the while
4919 # loop above only found empty branches between cl and the root of the
4920 # tree.
4921 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004922
Joanna Wang05b60342023-03-29 20:25:57 +00004923 if orig_parent is None:
4924 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004925 for i, cl in enumerate(ordered_cls):
4926 # If we're in the middle of the stack, set end_commit to downstream's
4927 # direct ancestor.
4928 if i + 1 < len(ordered_cls):
4929 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4930 else:
4931 child_base_commit = None
4932 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004933 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004934 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004935 end_commit=child_base_commit)
4936 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004937 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004938 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004939
4940 # Create refspec options
4941 cl, new_upload = uploads_by_cl[-1]
4942 refspec_opts = cl._GetRefSpecOptions(
4943 options,
4944 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004945 multi_change_upload=len(uploads_by_cl) > 1,
4946 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004947 refspec_suffix = ''
4948 if refspec_opts:
4949 refspec_suffix = '%' + ','.join(refspec_opts)
4950 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4951 refspec_suffix)
4952
4953 remote, remote_branch = cl.GetRemoteBranch()
4954 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4955 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4956 refspec_suffix)
4957
4958 # Git push
4959 git_push_metadata = {
4960 'gerrit_host':
4961 cl.GetGerritHost(),
4962 'title':
4963 options.title or '<untitled>',
4964 'change_id':
4965 git_footers.get_footer_change_id(new_upload.change_desc.description),
4966 'description':
4967 new_upload.change_desc.description,
4968 }
4969 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004970 git_push_metadata,
4971 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004972
4973 # Post push updates
4974 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4975 change_numbers = [
4976 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4977 ]
4978
4979 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4980 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4981
4982 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004983
4984
4985def _UploadAllPrecheck(options, orig_args):
4986 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4987 """Checks the state of the tree and gives the user uploading options
4988
4989 Returns: A tuple of the ordered list of changes that have new commits
4990 since their last upload and a boolean of whether the user wants to
4991 cherry-pick and upload the current branch instead of uploading all cls.
4992 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004993 cl = Changelist()
4994 if cl.GetBranch() is None:
4995 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4996
Joanna Wang18de1f62023-01-21 01:24:24 +00004997 branch_ref = None
4998 cls = []
4999 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00005000 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005001
5002 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
5003
5004 while True:
5005 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
5006 DieWithError(
5007 'More than %s branches in the stack have not been uploaded.\n'
5008 'Are your branches in a misconfigured state?\n'
5009 'If not, please upload some upstream changes first.' %
5010 (_MAX_STACKED_BRANCHES_UPLOAD))
5011
5012 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00005013
Joanna Wang6215dd02023-02-07 15:58:03 +00005014 # Only add CL if it has anything to commit.
5015 base_commit = cl.GetCommonAncestorWithUpstream()
5016 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5017
5018 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
5019 if diff:
5020 cls.append(cl)
5021 if (not first_pass and
5022 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5023 # We are mid-stack and the user must upload their upstream branches.
5024 must_upload_upstream = True
5025 elif first_pass: # The current branch has nothing to commit. Exit.
5026 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5027 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5028 first_pass = False
5029
5030 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005032 branch_ref = upstream_branch_ref # set branch for next run.
5033
Joanna Wang6215dd02023-02-07 15:58:03 +00005034 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5035 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5036 upstream_branch,
5037 LAST_UPLOAD_HASH_CONFIG_KEY)
5038
Joanna Wang18de1f62023-01-21 01:24:24 +00005039 # Case 1: We've reached the beginning of the tree.
5040 if origin != '.':
5041 break
5042
Joanna Wang18de1f62023-01-21 01:24:24 +00005043 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005044 # the user MUST upload them unless they are empty. Continue to
5045 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005046 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005047 continue
5048
Joanna Wang18de1f62023-01-21 01:24:24 +00005049 # Case 3: If upstream's last_upload == cl.base_commit we do
5050 # not need to upload any more upstreams from this point on.
5051 # (Even if there may be diverged branches higher up the tree)
5052 if base_commit == upstream_last_upload:
5053 break
5054
5055 # Case 4: If upstream's last_upload < cl.base_commit we are
5056 # uploading cl and upstream_cl.
5057 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005058 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005059 continue
5060
5061 # Case 5: If cl.base_commit < upstream's last_upload the user
5062 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005063 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005064 DieWithError(
5065 'At least one branch in the stack has diverged from its upstream '
5066 'branch and does not contain its upstream\'s last upload.\n'
5067 'Please rebase the stack with `git rebase-update` before uploading.')
5068
5069 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5070 # any relation to commits in the tree. Continue up the tree until we hit
5071 # the root.
5072
5073 # We assume all cls in the stack have the same auth requirements and only
5074 # check this once.
5075 cls[0].EnsureAuthenticated(force=options.force)
5076
5077 cherry_pick = False
5078 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005079 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005080 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005081 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005082 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005083 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005084 msg = ('At least one parent branch in `%s` has never been uploaded '
5085 'and must be uploaded before/with `%s`.\n' %
5086 (branches, cls[1].branch))
5087 if options.cherry_pick_stacked:
5088 DieWithError(msg)
5089 if not options.force:
5090 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005091 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005092 if options.cherry_pick_stacked:
5093 print('cherry-picking `%s` on %s\'s last upload' %
5094 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005095 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005096 elif not options.force:
5097 answer = gclient_utils.AskForData(
5098 '\n' + opt_message +
5099 'Press enter to update branches %s.\nOr type `n` to upload only '
5100 '`%s` cherry-picked on %s\'s last upload:' %
5101 (branches, cls[0].branch, cls[1].branch))
5102 if answer.lower() == 'n':
5103 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005104 return cls, cherry_pick
5105
5106
Francois Dorayd42c6812017-05-30 15:10:20 -04005107@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005108@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005109def CMDsplit(parser, args):
5110 """Splits a branch into smaller branches and uploads CLs.
5111
5112 Creates a branch and uploads a CL for each group of files modified in the
5113 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005114 comment, the string '$directory', is replaced with the directory containing
5115 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005116 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005117 parser.add_option('-d', '--description', dest='description_file',
5118 help='A text file containing a CL description in which '
5119 '$directory will be replaced by each CL\'s directory.')
5120 parser.add_option('-c', '--comment', dest='comment_file',
5121 help='A text file containing a CL comment.')
5122 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005123 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005124 help='List the files and reviewers for each CL that would '
5125 'be created, but don\'t create branches or CLs.')
5126 parser.add_option('--cq-dry-run', action='store_true',
5127 help='If set, will do a cq dry run for each uploaded CL. '
5128 'Please be careful when doing this; more than ~10 CLs '
5129 'has the potential to overload our build '
5130 'infrastructure. Try to upload these not during high '
5131 'load times (usually 11-3 Mountain View time). Email '
5132 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005133 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5134 default=True,
5135 help='Sends your change to the CQ after an approval. Only '
5136 'works on repos that have the Auto-Submit label '
5137 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005138 parser.add_option('--max-depth',
5139 type='int',
5140 default=0,
5141 help='The max depth to look for OWNERS files. Useful for '
5142 'controlling the granularity of the split CLs, e.g. '
5143 '--max-depth=1 will only split by top-level '
5144 'directory. Specifying a value less than 1 means no '
5145 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005146 options, _ = parser.parse_args(args)
5147
5148 if not options.description_file:
5149 parser.error('No --description flag specified.')
5150
5151 def WrappedCMDupload(args):
5152 return CMDupload(OptionParser(), args)
5153
Daniel Cheng403c44e2022-10-05 22:24:58 +00005154 return split_cl.SplitCl(options.description_file, options.comment_file,
5155 Changelist, WrappedCMDupload, options.dry_run,
5156 options.cq_dry_run, options.enable_auto_submit,
5157 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005158
5159
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005160@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005161@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005162def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005163 """DEPRECATED: Used to commit the current changelist via git-svn."""
5164 message = ('git-cl no longer supports committing to SVN repositories via '
5165 'git-svn. You probably want to use `git cl land` instead.')
5166 print(message)
5167 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005168
5169
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005170@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005171@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005172def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173 """Commits the current changelist via git.
5174
5175 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5176 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005177 """
5178 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5179 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005180 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005181 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005182 parser.add_option('--parallel', action='store_true',
5183 help='Run all tests specified by input_api.RunTests in all '
5184 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005185 parser.add_option('--resultdb', action='store_true',
5186 help='Run presubmit checks in the ResultSink environment '
5187 'and send results to the ResultDB database.')
5188 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005189 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005190
Edward Lemur934836a2019-09-09 20:16:54 +00005191 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005192
Robert Iannucci2e73d432018-03-14 01:10:47 -07005193 if not cl.GetIssue():
5194 DieWithError('You must upload the change first to Gerrit.\n'
5195 ' If you would rather have `git cl land` upload '
5196 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005197 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5198 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005199
5200
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005201@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005202@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005203def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005204 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005205 parser.add_option('-b', dest='newbranch',
5206 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005207 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005208 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005209 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005210 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005211
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005212 group = optparse.OptionGroup(
5213 parser,
5214 'Options for continuing work on the current issue uploaded from a '
5215 'different clone (e.g. different machine). Must be used independently '
5216 'from the other options. No issue number should be specified, and the '
5217 'branch must have an issue number associated with it')
5218 group.add_option('--reapply', action='store_true', dest='reapply',
5219 help='Reset the branch and reapply the issue.\n'
5220 'CAUTION: This will undo any local changes in this '
5221 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005222
5223 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005224 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005225 parser.add_option_group(group)
5226
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005227 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005228
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005229 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005230 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005231 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005232 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005233 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005234
Edward Lemur934836a2019-09-09 20:16:54 +00005235 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005236 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005237 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005238
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005239 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005240 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005241 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005242
5243 RunGit(['reset', '--hard', upstream])
5244 if options.pull:
5245 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005246
Edward Lemur678a6842019-10-03 22:25:05 +00005247 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005248 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5249 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005250
5251 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005252 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005253
Edward Lemurf38bc172019-09-03 21:02:13 +00005254 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005255 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005256 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005257
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005258 # We don't want uncommitted changes mixed up with the patch.
5259 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005260 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005261
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005262 if options.newbranch:
5263 if options.force:
5264 RunGit(['branch', '-D', options.newbranch],
5265 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005266 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005267
Edward Lemur678a6842019-10-03 22:25:05 +00005268 cl = Changelist(
5269 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005270
Edward Lemur678a6842019-10-03 22:25:05 +00005271 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005272 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005273
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005274 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5275 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005276
5277
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005278def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005279 """Fetches the tree status and returns either 'open', 'closed',
5280 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005281 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005282 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005283 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 if status.find('closed') != -1 or status == '0':
5285 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005286
5287 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005288 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005289
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005291 return 'unset'
5292
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005293
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294def GetTreeStatusReason():
5295 """Fetches the tree status from a json url and returns the message
5296 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005297 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005298 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005299 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005300 status = json.loads(connection.read())
5301 connection.close()
5302 return status['message']
5303
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005304
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005305@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005306def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005307 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005308 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005309 status = GetTreeStatus()
5310 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005311 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005312 return 2
5313
vapiera7fbd5a2016-06-16 09:17:49 -07005314 print('The tree is %s' % status)
5315 print()
5316 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005317 if status != 'open':
5318 return 1
5319 return 0
5320
5321
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005322@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005323def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005324 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5325 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005326 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005327 '-b', '--bot', action='append',
5328 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5329 'times to specify multiple builders. ex: '
5330 '"-b win_rel -b win_layout". See '
5331 'the try server waterfall for the builders name and the tests '
5332 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005333 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005334 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005335 help=('Buildbucket bucket to send the try requests. Format: '
5336 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005338 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005339 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005340 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005341 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005342 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005343 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005344 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005345 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005346 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005347 '-q',
5348 '--quick-run',
5349 action='store_true',
5350 default=False,
5351 help='trigger in quick run mode '
5352 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5353 'uick_run.md) (chromium only).')
5354 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005355 '--category', default='git_cl_try', help='Specify custom build category.')
5356 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005357 '--project',
5358 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005359 'in recipe to determine to which repository or directory to '
5360 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '-p', '--property', dest='properties', action='append', default=[],
5363 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005364 'key2=value2 etc. The value will be treated as '
5365 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005366 'NOTE: using this may make your tryjob not usable for CQ, '
5367 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005368 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005369 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5370 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005371 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005372 parser.add_option(
5373 '-R', '--retry-failed', action='store_true', default=False,
5374 help='Retry failed jobs from the latest set of tryjobs. '
5375 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005376 parser.add_option(
5377 '-i', '--issue', type=int,
5378 help='Operate on this issue instead of the current branch\'s implicit '
5379 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005380 options, args = parser.parse_args(args)
5381
machenbach@chromium.org45453142015-09-15 08:45:22 +00005382 # Make sure that all properties are prop=value pairs.
5383 bad_params = [x for x in options.properties if '=' not in x]
5384 if bad_params:
5385 parser.error('Got properties with missing "=": %s' % bad_params)
5386
maruel@chromium.org15192402012-09-06 12:38:29 +00005387 if args:
5388 parser.error('Unknown arguments: %s' % args)
5389
Edward Lemur934836a2019-09-09 20:16:54 +00005390 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005391 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005392 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005393
Edward Lemurf38bc172019-09-03 21:02:13 +00005394 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005395 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005396
tandriie113dfd2016-10-11 10:20:12 -07005397 error_message = cl.CannotTriggerTryJobReason()
5398 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005399 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005400
Edward Lemur45768512020-03-02 19:03:14 +00005401 if options.bot:
5402 if options.retry_failed:
5403 parser.error('--bot is not compatible with --retry-failed.')
5404 if not options.bucket:
5405 parser.error('A bucket (e.g. "chromium/try") is required.')
5406
5407 triggered = [b for b in options.bot if 'triggered' in b]
5408 if triggered:
5409 parser.error(
5410 'Cannot schedule builds on triggered bots: %s.\n'
5411 'This type of bot requires an initial job from a parent (usually a '
5412 'builder). Schedule a job on the parent instead.\n' % triggered)
5413
5414 if options.bucket.startswith('.master'):
5415 parser.error('Buildbot masters are not supported.')
5416
5417 project, bucket = _parse_bucket(options.bucket)
5418 if project is None or bucket is None:
5419 parser.error('Invalid bucket: %s.' % options.bucket)
5420 jobs = sorted((project, bucket, bot) for bot in options.bot)
5421 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005422 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005423 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005424 if options.verbose:
5425 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005426 jobs = _filter_failed_for_retry(builds)
5427 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005428 print('There are no failed jobs in the latest set of jobs '
5429 '(patchset #%d), doing nothing.' % patchset)
5430 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005431 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005432 if num_builders > 10:
5433 confirm_or_exit('There are %d builders with failed builds.'
5434 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005435 elif options.quick_run:
5436 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5437 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005438 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005439 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005440 print('git cl try with no bots now defaults to CQ dry run.')
5441 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5442 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005443
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005444 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005445 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005446 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005447 except BuildbucketResponseException as ex:
5448 print('ERROR: %s' % ex)
5449 return 1
5450 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005451
5452
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005453@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005454def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005455 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005456 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005457 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005458 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005459 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005460 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005461 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005462 '--color', action='store_true', default=setup_color.IS_TTY,
5463 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005464 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005465 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5466 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005467 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005468 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005469 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005470 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005471 parser.add_option(
5472 '-i', '--issue', type=int,
5473 help='Operate on this issue instead of the current branch\'s implicit '
5474 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475 options, args = parser.parse_args(args)
5476 if args:
5477 parser.error('Unrecognized args: %s' % ' '.join(args))
5478
Edward Lemur934836a2019-09-09 20:16:54 +00005479 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005480 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005481 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005482
tandrii221ab252016-10-06 08:12:04 -07005483 patchset = options.patchset
5484 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005485 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005486 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005487 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005488 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005489 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005490 cl.GetIssue())
5491
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005492 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005493 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005494 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005495 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005496 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005497 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005498 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005499 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005500 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005501 return 0
5502
5503
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005504@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005505@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005506def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005507 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005508 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005509 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005510 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005511
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005512 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005513 if args:
5514 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005515 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005516 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005517 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005518 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005519
5520 # Clear configured merge-base, if there is one.
5521 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005522 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005523 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005524 return 0
5525
5526
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005527@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005528def CMDweb(parser, args):
5529 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005530 parser.add_option('-p',
5531 '--print-only',
5532 action='store_true',
5533 dest='print_only',
5534 help='Only print the Gerrit URL, don\'t open it in the '
5535 'browser.')
5536 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005537 if args:
5538 parser.error('Unrecognized args: %s' % ' '.join(args))
5539
5540 issue_url = Changelist().GetIssueURL()
5541 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005542 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005543 return 1
5544
Orr Bernstein0b960582022-12-22 20:16:18 +00005545 if options.print_only:
5546 print(issue_url)
5547 return 0
5548
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005549 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005550 # allows us to hide the "Created new window in existing browser session."
5551 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005552 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005553 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005554 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005555 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005556 os.open(os.devnull, os.O_RDWR)
5557 try:
5558 webbrowser.open(issue_url)
5559 finally:
5560 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005561 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005562 return 0
5563
5564
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005565@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005566def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005567 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005568 parser.add_option('-d', '--dry-run', action='store_true',
5569 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005570 parser.add_option(
5571 '-q',
5572 '--quick-run',
5573 action='store_true',
5574 help='trigger in quick run mode '
5575 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5576 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005577 parser.add_option('-c', '--clear', action='store_true',
5578 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005579 parser.add_option(
5580 '-i', '--issue', type=int,
5581 help='Operate on this issue instead of the current branch\'s implicit '
5582 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005583 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005584 if args:
5585 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005586 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5587 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005588
Edward Lemur934836a2019-09-09 20:16:54 +00005589 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005590 if not cl.GetIssue():
5591 parser.error('Must upload the issue first.')
5592
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005593 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005594 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005595 elif options.quick_run:
5596 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005597 elif options.dry_run:
5598 state = _CQState.DRY_RUN
5599 else:
5600 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005601 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005602 return 0
5603
5604
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005605@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005606def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005607 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005608 parser.add_option(
5609 '-i', '--issue', type=int,
5610 help='Operate on this issue instead of the current branch\'s implicit '
5611 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005612 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005613 if args:
5614 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005615 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005616 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005617 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005618 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005619 cl.CloseIssue()
5620 return 0
5621
5622
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005623@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005624def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005625 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005626 parser.add_option(
5627 '--stat',
5628 action='store_true',
5629 dest='stat',
5630 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005631 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005632 if args:
5633 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005634
Edward Lemur934836a2019-09-09 20:16:54 +00005635 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005636 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005637 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005638 if not issue:
5639 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005640
Gavin Makbe2e9262022-11-08 23:41:55 +00005641 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005642 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005643 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005644 if not base:
5645 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5646 revision_info = detail['revisions'][detail['current_revision']]
5647 fetch_info = revision_info['fetch']['http']
5648 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5649 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005650
Aaron Gablea718c3e2017-08-28 17:47:28 -07005651 cmd = ['git', 'diff']
5652 if options.stat:
5653 cmd.append('--stat')
5654 cmd.append(base)
5655 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005656
5657 return 0
5658
5659
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005660@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005661def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005662 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005663 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005664 '--ignore-current',
5665 action='store_true',
5666 help='Ignore the CL\'s current reviewers and start from scratch.')
5667 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005668 '--ignore-self',
5669 action='store_true',
5670 help='Do not consider CL\'s author as an owners.')
5671 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005672 '--no-color',
5673 action='store_true',
5674 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005675 parser.add_option(
5676 '--batch',
5677 action='store_true',
5678 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005679 # TODO: Consider moving this to another command, since other
5680 # git-cl owners commands deal with owners for a given CL.
5681 parser.add_option(
5682 '--show-all',
5683 action='store_true',
5684 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005685 options, args = parser.parse_args(args)
5686
Edward Lemur934836a2019-09-09 20:16:54 +00005687 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005688 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005689
Yang Guo6e269a02019-06-26 11:17:02 +00005690 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005691 if len(args) == 0:
5692 print('No files specified for --show-all. Nothing to do.')
5693 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005694 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005695 for path in args:
5696 print('Owners for %s:' % path)
5697 print('\n'.join(
5698 ' - %s' % owner
5699 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005700 return 0
5701
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005702 if args:
5703 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005704 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005705 base_branch = args[0]
5706 else:
5707 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005708 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005709
Edward Lemur2c62b332020-03-12 22:12:33 +00005710 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005711
5712 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005713 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5714 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005715 return 0
5716
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005717 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005718 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005719 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005720 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005721 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005722 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005723 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005724
5725
Aiden Bennerc08566e2018-10-03 17:52:42 +00005726def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005727 """Generates a diff command."""
5728 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005729 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5730
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005731 if allow_prefix:
5732 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5733 # case that diff.noprefix is set in the user's git config.
5734 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5735 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005736 diff_cmd += ['--no-prefix']
5737
5738 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005739
5740 if args:
5741 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005742 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005743 diff_cmd.append(arg)
5744 else:
5745 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005746
5747 return diff_cmd
5748
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005749
Jamie Madill5e96ad12020-01-13 16:08:35 +00005750def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5751 """Runs clang-format-diff and sets a return value if necessary."""
5752
5753 if not clang_diff_files:
5754 return 0
5755
5756 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5757 # formatted. This is used to block during the presubmit.
5758 return_value = 0
5759
5760 # Locate the clang-format binary in the checkout
5761 try:
5762 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5763 except clang_format.NotFoundError as e:
5764 DieWithError(e)
5765
5766 if opts.full or settings.GetFormatFullByDefault():
5767 cmd = [clang_format_tool]
5768 if not opts.dry_run and not opts.diff:
5769 cmd.append('-i')
5770 if opts.dry_run:
5771 for diff_file in clang_diff_files:
5772 with open(diff_file, 'r') as myfile:
5773 code = myfile.read().replace('\r\n', '\n')
5774 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5775 stdout = stdout.replace('\r\n', '\n')
5776 if opts.diff:
5777 sys.stdout.write(stdout)
5778 if code != stdout:
5779 return_value = 2
5780 else:
5781 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5782 if opts.diff:
5783 sys.stdout.write(stdout)
5784 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005785 try:
5786 script = clang_format.FindClangFormatScriptInChromiumTree(
5787 'clang-format-diff.py')
5788 except clang_format.NotFoundError as e:
5789 DieWithError(e)
5790
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005791 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005792 if not opts.dry_run and not opts.diff:
5793 cmd.append('-i')
5794
5795 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005796 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005797
Edward Lesmes89624cd2020-04-06 17:51:56 +00005798 env = os.environ.copy()
5799 env['PATH'] = (
5800 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5801 stdout = RunCommand(
5802 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005803 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005804 if opts.diff:
5805 sys.stdout.write(stdout)
5806 if opts.dry_run and len(stdout) > 0:
5807 return_value = 2
5808
5809 return return_value
5810
5811
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005812def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5813 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5814 presubmit checks have failed (and returns 0 otherwise)."""
5815
5816 if not rust_diff_files:
5817 return 0
5818
5819 # Locate the rustfmt binary.
5820 try:
5821 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5822 except rustfmt.NotFoundError as e:
5823 DieWithError(e)
5824
5825 # TODO(crbug.com/1231317): Support formatting only the changed lines
5826 # if `opts.full or settings.GetFormatFullByDefault()` is False. See also:
5827 # https://github.com/emilio/rustfmt-format-diff
5828 cmd = [rustfmt_tool]
5829 if opts.dry_run:
5830 cmd.append('--check')
5831 cmd += rust_diff_files
5832 rustfmt_exitcode = subprocess2.call(cmd)
5833
5834 if opts.presubmit and rustfmt_exitcode != 0:
5835 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005836
5837 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005838
5839
Olivier Robin0a6b5442022-04-07 07:25:04 +00005840def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5841 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5842 that presubmit checks have failed (and returns 0 otherwise)."""
5843
5844 if not swift_diff_files:
5845 return 0
5846
5847 # Locate the swift-format binary.
5848 try:
5849 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5850 except swift_format.NotFoundError as e:
5851 DieWithError(e)
5852
5853 cmd = [swift_format_tool]
5854 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005855 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005856 else:
5857 cmd += ['format', '-i']
5858 cmd += swift_diff_files
5859 swift_format_exitcode = subprocess2.call(cmd)
5860
5861 if opts.presubmit and swift_format_exitcode != 0:
5862 return 2
5863
5864 return 0
5865
5866
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005867def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005868 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005869 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005870
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005871
enne@chromium.org555cfe42014-01-29 18:21:39 +00005872@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005873@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005874def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005875 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005876 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005877 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005878 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005879 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005880 parser.add_option('--full', action='store_true',
5881 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005882 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005883 parser.add_option('--dry-run', action='store_true',
5884 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005885 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005886 '--no-clang-format',
5887 dest='clang_format',
5888 action='store_false',
5889 default=True,
5890 help='Disables formatting of various file types using clang-format.')
5891 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005892 '--python',
5893 action='store_true',
5894 default=None,
5895 help='Enables python formatting on all python files.')
5896 parser.add_option(
5897 '--no-python',
5898 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005899 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005900 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005901 'If neither --python or --no-python are set, python files that have a '
5902 '.style.yapf file in an ancestor directory will be formatted. '
5903 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005904 parser.add_option(
5905 '--js',
5906 action='store_true',
5907 help='Format javascript code with clang-format. '
5908 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005909 parser.add_option('--diff', action='store_true',
5910 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005911 parser.add_option('--presubmit', action='store_true',
5912 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005913
5914 parser.add_option('--rust-fmt',
5915 dest='use_rust_fmt',
5916 action='store_true',
5917 default=rustfmt.IsRustfmtSupported(),
5918 help='Enables formatting of Rust file types using rustfmt.')
5919 parser.add_option(
5920 '--no-rust-fmt',
5921 dest='use_rust_fmt',
5922 action='store_false',
5923 help='Disables formatting of Rust file types using rustfmt.')
5924
Olivier Robin0a6b5442022-04-07 07:25:04 +00005925 parser.add_option(
5926 '--swift-format',
5927 dest='use_swift_format',
5928 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005929 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005930 help='Enables formatting of Swift file types using swift-format '
5931 '(macOS host only).')
5932 parser.add_option(
5933 '--no-swift-format',
5934 dest='use_swift_format',
5935 action='store_false',
5936 help='Disables formatting of Swift file types using swift-format.')
5937
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005938 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005939
Garrett Beaty91a6f332020-01-06 16:57:24 +00005940 if opts.python is not None and opts.no_python:
5941 raise parser.error('Cannot set both --python and --no-python')
5942 if opts.no_python:
5943 opts.python = False
5944
Daniel Chengc55eecf2016-12-30 03:11:02 -08005945 # Normalize any remaining args against the current path, so paths relative to
5946 # the current directory are still resolved as expected.
5947 args = [os.path.join(os.getcwd(), arg) for arg in args]
5948
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005949 # git diff generates paths against the root of the repository. Change
5950 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005951 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005952 if rel_base_path:
5953 os.chdir(rel_base_path)
5954
digit@chromium.org29e47272013-05-17 17:01:46 +00005955 # Grab the merge-base commit, i.e. the upstream commit of the current
5956 # branch when it was created or the last time it was rebased. This is
5957 # to cover the case where the user may have called "git fetch origin",
5958 # moving the origin branch to a newer commit, but hasn't rebased yet.
5959 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005960 upstream_branch = opts.upstream
5961 if not upstream_branch:
5962 cl = Changelist()
5963 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005964 if upstream_branch:
5965 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5966 upstream_commit = upstream_commit.strip()
5967
5968 if not upstream_commit:
5969 DieWithError('Could not find base commit for this branch. '
5970 'Are you in detached state?')
5971
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005972 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5973 diff_output = RunGit(changed_files_cmd)
5974 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005975 # Filter out files deleted by this CL
5976 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005977
Andreas Haas417d89c2020-02-06 10:24:27 +00005978 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005979 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005980
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005981 clang_diff_files = []
5982 if opts.clang_format:
5983 clang_diff_files = [
5984 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5985 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005986 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005987 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005988 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005989 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005990
Edward Lesmes50da7702020-03-30 19:23:43 +00005991 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005992
Jamie Madill5e96ad12020-01-13 16:08:35 +00005993 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5994 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005995
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005996 if opts.use_rust_fmt:
5997 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5998 upstream_commit)
5999 if rust_fmt_return_value == 2:
6000 return_value = 2
6001
Olivier Robin0a6b5442022-04-07 07:25:04 +00006002 if opts.use_swift_format:
6003 if sys.platform != 'darwin':
6004 DieWithError('swift-format is only supported on macOS.')
6005 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
6006 upstream_commit)
6007 if swift_format_return_value == 2:
6008 return_value = 2
6009
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006010 # Similar code to above, but using yapf on .py files rather than clang-format
6011 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006012 py_explicitly_disabled = opts.python is not None and not opts.python
6013 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00006014 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6015 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006016
Aiden Bennerc08566e2018-10-03 17:52:42 +00006017 # Used for caching.
6018 yapf_configs = {}
6019 for f in python_diff_files:
6020 # Find the yapf style config for the current file, defaults to depot
6021 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006022 _FindYapfConfigFile(f, yapf_configs, top_dir)
6023
6024 # Turn on python formatting by default if a yapf config is specified.
6025 # This breaks in the case of this repo though since the specified
6026 # style file is also the global default.
6027 if opts.python is None:
6028 filtered_py_files = []
6029 for f in python_diff_files:
6030 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6031 filtered_py_files.append(f)
6032 else:
6033 filtered_py_files = python_diff_files
6034
6035 # Note: yapf still seems to fix indentation of the entire file
6036 # even if line ranges are specified.
6037 # See https://github.com/google/yapf/issues/499
6038 if not opts.full and filtered_py_files:
6039 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6040
Brian Sheedyb4307d52019-12-02 19:18:17 +00006041 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6042 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6043 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006044
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006045 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006046 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6047 # Default to pep8 if not .style.yapf is found.
6048 if not yapf_style:
6049 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006050
Peter Wend9399922020-06-17 17:33:49 +00006051 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006052 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006053 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006054 else:
6055 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006056
6057 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006058
6059 has_formattable_lines = False
6060 if not opts.full:
6061 # Only run yapf over changed line ranges.
6062 for diff_start, diff_len in py_line_diffs[f]:
6063 diff_end = diff_start + diff_len - 1
6064 # Yapf errors out if diff_end < diff_start but this
6065 # is a valid line range diff for a removal.
6066 if diff_end >= diff_start:
6067 has_formattable_lines = True
6068 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6069 # If all line diffs were removals we have nothing to format.
6070 if not has_formattable_lines:
6071 continue
6072
6073 if opts.diff or opts.dry_run:
6074 cmd += ['--diff']
6075 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006076 stdout = RunCommand(cmd,
6077 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006078 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006079 cwd=top_dir,
6080 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006081 if opts.diff:
6082 sys.stdout.write(stdout)
6083 elif len(stdout) > 0:
6084 return_value = 2
6085 else:
6086 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006087 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006088
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006089 # Format GN build files. Always run on full build files for canonical form.
6090 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006091 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006092 if opts.dry_run or opts.diff:
6093 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006094 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006095 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006096 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006097 cwd=top_dir)
6098 if opts.dry_run and gn_ret == 2:
6099 return_value = 2 # Not formatted.
6100 elif opts.diff and gn_ret == 2:
6101 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006102 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006103 elif gn_ret != 0:
6104 # For non-dry run cases (and non-2 return values for dry-run), a
6105 # nonzero error code indicates a failure, probably because the file
6106 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006107 DieWithError('gn format failed on ' + gn_diff_file +
6108 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006109
Ilya Shermane081cbe2017-08-15 17:51:04 -07006110 # Skip the metrics formatting from the global presubmit hook. These files have
6111 # a separate presubmit hook that issues an error if the files need formatting,
6112 # whereas the top-level presubmit script merely issues a warning. Formatting
6113 # these files is somewhat slow, so it's important not to duplicate the work.
6114 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006115 for diff_xml in GetDiffXMLs(diff_files):
6116 xml_dir = GetMetricsDir(diff_xml)
6117 if not xml_dir:
6118 continue
6119
Ilya Shermane081cbe2017-08-15 17:51:04 -07006120 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006121 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006122 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006123
6124 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6125 # command as histograms/pretty_print.py now needs a relative path argument
6126 # after splitting the histograms into multiple directories.
6127 # For example, in tools/metrics/ukm, pretty-print could be run using:
6128 # $ python pretty_print.py
6129 # But in tools/metrics/histogrmas, pretty-print should be run with an
6130 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006131 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006132 # $ python pretty_print.py enums.xml
6133
Weilun Shib92c4b72020-08-27 17:45:11 +00006134 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006135 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006136 cmd.append(diff_xml)
6137
Ilya Shermane081cbe2017-08-15 17:51:04 -07006138 if opts.dry_run or opts.diff:
6139 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006140
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006141 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6142 # `shell` param and instead replace `'vpython'` with
6143 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006144 stdout = RunCommand(cmd,
6145 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006146 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006147 if opts.diff:
6148 sys.stdout.write(stdout)
6149 if opts.dry_run and stdout:
6150 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006151
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006152 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006153
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006154
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006155def GetDiffXMLs(diff_files):
6156 return [
6157 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6158 ]
6159
6160
6161def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006162 metrics_xml_dirs = [
6163 os.path.join('tools', 'metrics', 'actions'),
6164 os.path.join('tools', 'metrics', 'histograms'),
6165 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006166 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006167 os.path.join('tools', 'metrics', 'ukm'),
6168 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006169 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006170 if diff_xml.startswith(xml_dir):
6171 return xml_dir
6172 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006173
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006174
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006175@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006176@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006177def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006178 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006179 _, args = parser.parse_args(args)
6180
6181 if len(args) != 1:
6182 parser.print_help()
6183 return 1
6184
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006185 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006186 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006187 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006188
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006189 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006190
Edward Lemur52969c92020-02-06 18:15:28 +00006191 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006192 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006193 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006194
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006195 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006196 for key, issue in [x.split() for x in output.splitlines()]:
6197 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006198 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006199
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006200 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006201 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006202 return 1
6203 if len(branches) == 1:
6204 RunGit(['checkout', branches[0]])
6205 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006206 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006207 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006208 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006209 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006210 try:
6211 RunGit(['checkout', branches[int(which)]])
6212 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006213 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006214 return 1
6215
6216 return 0
6217
6218
maruel@chromium.org29404b52014-09-08 22:58:00 +00006219def CMDlol(parser, args):
6220 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006221 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006222 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6223 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6224 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006225 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006226 return 0
6227
6228
Josip Sokcevic0399e172022-03-21 23:11:51 +00006229def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006230 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006231 print(utils.depot_tools_version())
6232
6233
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006234class OptionParser(optparse.OptionParser):
6235 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006236
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006237 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006238 optparse.OptionParser.__init__(
6239 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006240 self.add_option(
6241 '-v', '--verbose', action='count', default=0,
6242 help='Use 2 times for more debugging info')
6243
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006244 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006245 try:
6246 return self._parse_args(args)
6247 finally:
6248 # Regardless of success or failure of args parsing, we want to report
6249 # metrics, but only after logging has been initialized (if parsing
6250 # succeeded).
6251 global settings
6252 settings = Settings()
6253
Edward Lesmes9c349062021-05-06 20:02:39 +00006254 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006255 try:
6256 # GetViewVCUrl ultimately calls logging method.
6257 project_url = settings.GetViewVCUrl().strip('/+')
6258 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6259 metrics.collector.add('project_urls', [project_url])
6260 except subprocess2.CalledProcessError:
6261 # Occurs when command is not executed in a git repository
6262 # We should not fail here. If the command needs to be executed
6263 # in a repo, it will be raised later.
6264 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006265
6266 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006267 # Create an optparse.Values object that will store only the actual passed
6268 # options, without the defaults.
6269 actual_options = optparse.Values()
6270 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6271 # Create an optparse.Values object with the default options.
6272 options = optparse.Values(self.get_default_values().__dict__)
6273 # Update it with the options passed by the user.
6274 options._update_careful(actual_options.__dict__)
6275 # Store the options passed by the user in an _actual_options attribute.
6276 # We store only the keys, and not the values, since the values can contain
6277 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006278 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006279
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006280 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006281 logging.basicConfig(
6282 level=levels[min(options.verbose, len(levels) - 1)],
6283 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6284 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006285
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006286 return options, args
6287
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006289def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006290 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006291 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006292 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006293 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006294
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006295 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006296 dispatcher = subcommand.CommandDispatcher(__name__)
6297 try:
6298 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006299 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006300 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006301 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006302 if e.code != 500:
6303 raise
6304 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006305 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006306 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006307 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006308
6309
6310if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006311 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6312 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006313 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006314 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006315 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006316 sys.exit(main(sys.argv[1:]))