blob: 9e56f70d8a0e133580fb5d6ed8ca374c8cd9f0af [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
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000170class GitPushError(Exception):
171 pass
172
173
Christopher Lamf732cd52017-01-24 12:40:11 +1100174def DieWithError(message, change_desc=None):
175 if change_desc:
176 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000177 print('\n ** Content of CL description **\n' +
178 '='*72 + '\n' +
179 change_desc.description + '\n' +
180 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100181
vapiera7fbd5a2016-06-16 09:17:49 -0700182 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183 sys.exit(1)
184
185
Christopher Lamf732cd52017-01-24 12:40:11 +1100186def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000187 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000188 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000189 with open(backup_path, 'wb') as backup_file:
190 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100191
192
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000193def GetNoGitPagerEnv():
194 env = os.environ.copy()
195 # 'cat' is a magical git string that disables pagers on all platforms.
196 env['GIT_PAGER'] = 'cat'
197 return env
198
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000199
bsep@chromium.org627d9002016-04-29 00:00:52 +0000200def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000201 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
203 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000204 except subprocess2.CalledProcessError as e:
205 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000206 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000207 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
208 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000209 out = e.stdout.decode('utf-8', 'replace')
210 if e.stderr:
211 out += e.stderr.decode('utf-8', 'replace')
212 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000213
214
215def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000216 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000218
219
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000220def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000221 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700222 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000223 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700224 else:
225 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000226 try:
tandrii5d48c322016-08-18 16:19:37 -0700227 (out, _), code = subprocess2.communicate(['git'] + args,
228 env=GetNoGitPagerEnv(),
229 stdout=subprocess2.PIPE,
230 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000231 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700232 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900233 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000234 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000235
236
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000237def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000238 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000239 return RunGitWithCode(args, suppress_stderr=True)[1]
240
241
tandrii2a16b952016-10-19 07:09:44 -0700242def time_sleep(seconds):
243 # Use this so that it can be mocked in tests without interfering with python
244 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700245 return time.sleep(seconds)
246
247
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000248def time_time():
249 # Use this so that it can be mocked in tests without interfering with python
250 # system machinery.
251 return time.time()
252
253
Edward Lemur1b52d872019-05-09 21:12:12 +0000254def datetime_now():
255 # Use this so that it can be mocked in tests without interfering with python
256 # system machinery.
257 return datetime.datetime.now()
258
259
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260def confirm_or_exit(prefix='', action='confirm'):
261 """Asks user to press enter to continue or press Ctrl+C to abort."""
262 if not prefix or prefix.endswith('\n'):
263 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100264 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265 mid = ' Press'
266 elif prefix.endswith(' '):
267 mid = 'press'
268 else:
269 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000270 gclient_utils.AskForData(
271 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272
273
274def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000275 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000276 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100277 while True:
278 if 'yes'.startswith(result):
279 return True
280 if 'no'.startswith(result):
281 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000282 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100283
284
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000286 prop_list = getattr(options, 'properties', [])
287 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000288 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000289 try:
290 properties[key] = json.loads(val)
291 except ValueError:
292 pass # If a value couldn't be evaluated, treat it as a string.
293 return properties
294
295
Edward Lemur4c707a22019-09-24 21:13:43 +0000296def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000297 """Calls a buildbucket v2 method and returns the parsed json response."""
298 headers = {
299 'Accept': 'application/json',
300 'Content-Type': 'application/json',
301 }
302 request = json.dumps(request)
303 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
304
305 logging.info('POST %s with %s' % (url, request))
306
307 attempts = 1
308 time_to_sleep = 1
309 while True:
310 response, content = http.request(url, 'POST', body=request, headers=headers)
311 if response.status == 200:
312 return json.loads(content[4:])
313 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
314 msg = '%s error when calling POST %s with %s: %s' % (
315 response.status, url, request, content)
316 raise BuildbucketResponseException(msg)
317 logging.debug(
318 '%s error when calling POST %s with %s. '
319 'Sleeping for %d seconds and retrying...' % (
320 response.status, url, request, time_to_sleep))
321 time.sleep(time_to_sleep)
322 time_to_sleep *= 2
323 attempts += 1
324
325 assert False, 'unreachable'
326
327
Edward Lemur6215c792019-10-03 21:59:05 +0000328def _parse_bucket(raw_bucket):
329 legacy = True
330 project = bucket = None
331 if '/' in raw_bucket:
332 legacy = False
333 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000335 elif raw_bucket.startswith('luci.'):
336 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000338 elif '.' in raw_bucket:
339 project = raw_bucket.split('.')[0]
340 bucket = raw_bucket
341 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000342 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000343 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
344 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000345
346
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000347def _canonical_git_googlesource_host(host):
348 """Normalizes Gerrit hosts (with '-review') to Git host."""
349 assert host.endswith(_GOOGLESOURCE)
350 # Prefix doesn't include '.' at the end.
351 prefix = host[:-(1 + len(_GOOGLESOURCE))]
352 if prefix.endswith('-review'):
353 prefix = prefix[:-len('-review')]
354 return prefix + '.' + _GOOGLESOURCE
355
356
357def _canonical_gerrit_googlesource_host(host):
358 git_host = _canonical_git_googlesource_host(host)
359 prefix = git_host.split('.', 1)[0]
360 return prefix + '-review.' + _GOOGLESOURCE
361
362
363def _get_counterpart_host(host):
364 assert host.endswith(_GOOGLESOURCE)
365 git = _canonical_git_googlesource_host(host)
366 gerrit = _canonical_gerrit_googlesource_host(git)
367 return git if gerrit == host else gerrit
368
369
Quinten Yearsley777660f2020-03-04 23:37:06 +0000370def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000371 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
373 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000374 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000375 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700376 options: Command-line options.
377 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000378 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000379 for project, bucket, builder in jobs:
380 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 print('To see results here, run: git cl try-results')
382 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700383
Quinten Yearsley777660f2020-03-04 23:37:06 +0000384 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 if not requests:
386 return
387
Edward Lemur5b929a42019-10-21 17:57:39 +0000388 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000389 http.force_exception_to_status_code = True
390
391 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000392 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
393 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000394
395 errors = [
396 ' ' + response['error']['message']
397 for response in batch_response.get('responses', [])
398 if 'error' in response
399 ]
400 if errors:
401 raise BuildbucketResponseException(
402 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
403
404
Quinten Yearsley777660f2020-03-04 23:37:06 +0000405def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000406 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000407 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000408 shared_properties = {
409 'category': options.ensure_value('category', 'git_cl_try')
410 }
411 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000412 shared_properties['clobber'] = True
413 shared_properties.update(_get_properties_from_options(options) or {})
414
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000415 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 shared_tags.append({'key': 'retry_failed',
418 'value': '1'})
419
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000421 for (project, bucket, builder) in jobs:
422 properties = shared_properties.copy()
423 if 'presubmit' in builder.lower():
424 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426 requests.append({
427 'scheduleBuild': {
428 'requestId': str(uuid.uuid4()),
429 'builder': {
430 'project': getattr(options, 'project', None) or project,
431 'bucket': bucket,
432 'builder': builder,
433 },
434 'gerritChanges': gerrit_changes,
435 'properties': properties,
436 'tags': [
437 {'key': 'builder', 'value': builder},
438 ] + shared_tags,
439 }
440 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000442 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000444 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000446 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000447 'id': options.revision,
448 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000449 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000450
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000451 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000452
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000453
Quinten Yearsley777660f2020-03-04 23:37:06 +0000454def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000456
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000457 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000458 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 request = {
461 'predicate': {
462 'gerritChanges': [changelist.GetGerritChange(patchset)],
463 },
464 'fields': ','.join('builds.*.' + field for field in fields),
465 }
tandrii221ab252016-10-06 08:12:04 -0700466
Edward Lemur5b929a42019-10-21 17:57:39 +0000467 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000468 if authenticator.has_cached_credentials():
469 http = authenticator.authorize(httplib2.Http())
470 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700471 print('Warning: Some results might be missing because %s' %
472 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000473 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 http.force_exception_to_status_code = True
476
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000477 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
478 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479
Edward Lemur45768512020-03-02 19:03:14 +0000480
Edward Lemur5b929a42019-10-21 17:57:39 +0000481def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 """Fetches builds from the latest patchset that has builds (within
483 the last few patchsets).
484
485 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 changelist (Changelist): The CL to fetch builds for
487 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000488 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
489 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000491 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
492 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """
494 assert buildbucket_host
495 assert changelist.GetIssue(), 'CL must be uploaded first'
496 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000497 if latest_patchset is None:
498 assert changelist.GetMostRecentPatchset()
499 ps = changelist.GetMostRecentPatchset()
500 else:
501 assert latest_patchset > 0, latest_patchset
502 ps = latest_patchset
503
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 min_ps = max(1, ps - 5)
505 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000506 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 if len(builds):
508 return builds, ps
509 ps -= 1
510 return [], 0
511
512
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000513def _filter_failed_for_retry(all_builds):
514 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515
516 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000518 i.e. a list of buildbucket.v2.Builds which includes status and builder
519 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520
521 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000522 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 """
Edward Lemur45768512020-03-02 19:03:14 +0000525 grouped = {}
526 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000527 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000528 key = (builder['project'], builder['bucket'], builder['builder'])
529 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530
Edward Lemur45768512020-03-02 19:03:14 +0000531 jobs = []
532 for (project, bucket, builder), builds in grouped.items():
533 if 'triggered' in builder:
534 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
535 'from a parent. Please schedule a manual job for the parent '
536 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537 continue
538 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
539 # Don't retry if any are running.
540 continue
Edward Lemur45768512020-03-02 19:03:14 +0000541 # If builder had several builds, retry only if the last one failed.
542 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
543 # build, but in case of retrying failed jobs retrying a flaky one makes
544 # sense.
545 builds = sorted(builds, key=lambda b: b['createTime'])
546 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
547 continue
548 # Don't retry experimental build previously triggered by CQ.
549 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
550 for t in builds[-1]['tags']):
551 continue
552 jobs.append((project, bucket, builder))
553
554 # Sort the jobs to make testing easier.
555 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556
557
Quinten Yearsley777660f2020-03-04 23:37:06 +0000558def _print_tryjobs(options, builds):
559 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 return
563
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 longest_builder = max(len(b['builder']['builder']) for b in builds)
565 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
568 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 builds_by_status = {}
571 for b in builds:
572 builds_by_status.setdefault(b['status'], []).append({
573 'id': b['id'],
574 'name': name_fmt.format(
575 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
576 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 sort_key = lambda b: (b['name'], b['id'])
579
580 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 if not builds:
583 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000586 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 else:
589 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 print(colorize(title))
592 for b in sorted(builds, key=sort_key):
593 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594
595 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 print_builds(
597 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
598 print_builds(
599 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
600 color=Fore.MAGENTA)
601 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
602 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
603 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000604 print_builds('Started:', builds_by_status.pop('STARTED', []),
605 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000606 print_builds(
607 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 print_builds(
610 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000611 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612
613
Aiden Bennerc08566e2018-10-03 17:52:42 +0000614def _ComputeDiffLineRanges(files, upstream_commit):
615 """Gets the changed line ranges for each file since upstream_commit.
616
617 Parses a git diff on provided files and returns a dict that maps a file name
618 to an ordered list of range tuples in the form (start_line, count).
619 Ranges are in the same format as a git diff.
620 """
621 # If files is empty then diff_output will be a full diff.
622 if len(files) == 0:
623 return {}
624
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000625 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000626 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 diff_output = RunGit(diff_cmd)
628
629 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
630 # 2 capture groups
631 # 0 == fname of diff file
632 # 1 == 'diff_start,diff_count' or 'diff_start'
633 # will match each of
634 # diff --git a/foo.foo b/foo.py
635 # @@ -12,2 +14,3 @@
636 # @@ -12,2 +17 @@
637 # running re.findall on the above string with pattern will give
638 # [('foo.py', ''), ('', '14,3'), ('', '17')]
639
640 curr_file = None
641 line_diffs = {}
642 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
643 if match[0] != '':
644 # Will match the second filename in diff --git a/a.py b/b.py.
645 curr_file = match[0]
646 line_diffs[curr_file] = []
647 else:
648 # Matches +14,3
649 if ',' in match[1]:
650 diff_start, diff_count = match[1].split(',')
651 else:
652 # Single line changes are of the form +12 instead of +12,1.
653 diff_start = match[1]
654 diff_count = 1
655
656 diff_start = int(diff_start)
657 diff_count = int(diff_count)
658
659 # If diff_count == 0 this is a removal we can ignore.
660 line_diffs[curr_file].append((diff_start, diff_count))
661
662 return line_diffs
663
664
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 """Checks if a yapf file is in any parent directory of fpath until top_dir.
667
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000669 is found returns None. Uses yapf_config_cache as a cache for previously found
670 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 # Return result if we've already computed it.
674 if fpath in yapf_config_cache:
675 return yapf_config_cache[fpath]
676
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 parent_dir = os.path.dirname(fpath)
678 if os.path.isfile(fpath):
679 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 # Otherwise fpath is a directory
682 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
683 if os.path.isfile(yapf_file):
684 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000685 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # If we're at the top level directory, or if we're at root
687 # there is no provided style.
688 ret = None
689 else:
690 # Otherwise recurse on the current directory.
691 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 yapf_config_cache[fpath] = ret
693 return ret
694
695
Brian Sheedyb4307d52019-12-02 19:18:17 +0000696def _GetYapfIgnorePatterns(top_dir):
697 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000698
699 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
700 but this functionality appears to break when explicitly passing files to
701 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000702 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703 the .yapfignore file should be in the directory that yapf is invoked from,
704 which we assume to be the top level directory in this case.
705
706 Args:
707 top_dir: The top level directory for the repository being formatted.
708
709 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000710 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711 """
712 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000714 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716
Anthony Politoc64e3902021-04-30 21:55:25 +0000717 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
718 stripped_line = line.strip()
719 # Comments and blank lines should be ignored.
720 if stripped_line.startswith('#') or stripped_line == '':
721 continue
722 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 return ignore_patterns
724
725
726def _FilterYapfIgnoredFiles(filepaths, patterns):
727 """Filters out any filepaths that match any of the given patterns.
728
729 Args:
730 filepaths: An iterable of strings containing filepaths to filter.
731 patterns: An iterable of strings containing fnmatch patterns to filter on.
732
733 Returns:
734 A list of strings containing all the elements of |filepaths| that did not
735 match any of the patterns in |patterns|.
736 """
737 # Not inlined so that tests can use the same implementation.
738 return [f for f in filepaths
739 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000740
741
Aaron Gable13101a62018-02-09 13:20:41 -0800742def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000743 """Prints statistics about the change to the user."""
744 # --no-ext-diff is broken in some versions of Git, so try to work around
745 # this by overriding the environment (but there is still a problem if the
746 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000747 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 if 'GIT_EXTERNAL_DIFF' in env:
749 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800752 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000753 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754
755
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000756class BuildbucketResponseException(Exception):
757 pass
758
759
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000760class Settings(object):
761 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000763 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 self.tree_status_url = None
765 self.viewvc_url = None
766 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000767 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000768 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000769 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000770 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000771 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000772 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773
Edward Lemur26964072020-02-19 19:18:51 +0000774 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000776 if self.updated:
777 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000778
Edward Lemur26964072020-02-19 19:18:51 +0000779 # The only value that actually changes the behavior is
780 # autoupdate = "false". Everything else means "true".
781 autoupdate = (
782 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
783
784 cr_settings_file = FindCodereviewSettingsFile()
785 if autoupdate != 'false' and cr_settings_file:
786 LoadCodereviewSettingsFromFile(cr_settings_file)
787 cr_settings_file.close()
788
789 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000791 @staticmethod
792 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000793 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 if self.root is None:
797 self.root = os.path.abspath(self.GetRelativeRoot())
798 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetTreeStatusUrl(self, error_ok=False):
801 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
803 if self.tree_status_url is None and not error_ok:
804 DieWithError(
805 'You must configure your tree status URL by running '
806 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 return self.tree_status_url
808
809 def GetViewVCUrl(self):
810 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000811 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.viewvc_url
813
rmistry@google.com90752582014-01-14 21:04:50 +0000814 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000815 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000816
rmistry@google.com5626a922015-02-26 14:03:30 +0000817 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000819 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000820 return run_post_upload_hook == "True"
821
Joanna Wangc8f23e22023-01-19 21:18:10 +0000822 def GetDefaultCCList(self):
823 return self._GetConfig('rietveld.cc')
824
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000825 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000826 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000827 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000828 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
829 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000830 # Default is squash now (http://crbug.com/611892#c23).
831 self.squash_gerrit_uploads = self._GetConfig(
832 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 return self.squash_gerrit_uploads
834
Edward Lesmes4de54132020-05-05 19:41:33 +0000835 def GetSquashGerritUploadsOverride(self):
836 """Return True or False if codereview.settings should be overridden.
837
838 Returns None if no override has been defined.
839 """
840 # See also http://crbug.com/611892#c23
841 result = self._GetConfig('gerrit.override-squash-uploads').lower()
842 if result == 'true':
843 return True
844 if result == 'false':
845 return False
846 return None
847
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000848 def GetIsGerrit(self):
849 """Return True if gerrit.host is set."""
850 if self.is_gerrit is None:
851 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
852 return self.is_gerrit
853
tandrii@chromium.org28253532016-04-14 13:46:56 +0000854 def GetGerritSkipEnsureAuthenticated(self):
855 """Return True if EnsureAuthenticated should not be done for Gerrit
856 uploads."""
857 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000858 self.gerrit_skip_ensure_authenticated = self._GetConfig(
859 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000860 return self.gerrit_skip_ensure_authenticated
861
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000862 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000863 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000864 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000865 # Git requires single quotes for paths with spaces. We need to replace
866 # them with double quotes for Windows to treat such paths as a single
867 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 return self.git_editor or None
870
thestig@chromium.org44202a22014-03-11 19:22:18 +0000871 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000872 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000873
874 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000875 return self._GetConfig(
876 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000878 def GetFormatFullByDefault(self):
879 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000880 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000881 result = (
882 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
883 error_ok=True).strip())
884 self.format_full_by_default = (result == 'true')
885 return self.format_full_by_default
886
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000887 def IsStatusCommitOrderByDate(self):
888 if self.is_status_commit_order_by_date is None:
889 result = (RunGit(['config', '--bool', 'cl.date-order'],
890 error_ok=True).strip())
891 self.is_status_commit_order_by_date = (result == 'true')
892 return self.is_status_commit_order_by_date
893
Edward Lemur26964072020-02-19 19:18:51 +0000894 def _GetConfig(self, key, default=''):
895 self._LazyUpdateIfNeeded()
896 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000897
898
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000899class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000900 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000901 NONE = 'none'
902 DRY_RUN = 'dry_run'
903 COMMIT = 'commit'
904
Struan Shrimpton8b2072b2023-07-31 21:01:26 +0000905 ALL_STATES = [NONE, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906
907
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000908class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000909 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000910 self.issue = issue
911 self.patchset = patchset
912 self.hostname = hostname
913
914 @property
915 def valid(self):
916 return self.issue is not None
917
918
Edward Lemurf38bc172019-09-03 21:02:13 +0000919def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000920 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
921 fail_result = _ParsedIssueNumberArgument()
922
Edward Lemur678a6842019-10-03 22:25:05 +0000923 if isinstance(arg, int):
924 return _ParsedIssueNumberArgument(issue=arg)
925 if not isinstance(arg, basestring):
926 return fail_result
927
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000928 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000929 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700930
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000931 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000932 if not url.startswith('http'):
933 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000934 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
935 if url.startswith(short_url):
936 url = gerrit_url + url[len(short_url):]
937 break
938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000939 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000940 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000941 except ValueError:
942 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200943
Alex Turner30ae6372022-01-04 02:32:52 +0000944 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
945 # URL.
946 if not arg.startswith('http') and '.' not in parsed_url.netloc:
947 return fail_result
948
Edward Lemur678a6842019-10-03 22:25:05 +0000949 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
950 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
951 # Short urls like https://domain/<issue_number> can be used, but don't allow
952 # specifying the patchset (you'd 404), but we allow that here.
953 if parsed_url.path == '/':
954 part = parsed_url.fragment
955 else:
956 part = parsed_url.path
957
958 match = re.match(
959 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
960 if not match:
961 return fail_result
962
963 issue = int(match.group('issue'))
964 patchset = match.group('patchset')
965 return _ParsedIssueNumberArgument(
966 issue=issue,
967 patchset=int(patchset) if patchset else None,
968 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000969
970
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000971def _create_description_from_log(args):
972 """Pulls out the commit log to use as a base for the CL description."""
973 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000974 if len(args) == 1 and args[0] == None:
975 # Handle the case where None is passed as the branch.
976 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000977 if len(args) == 1 and not args[0].endswith('.'):
978 log_args = [args[0] + '..']
979 elif len(args) == 1 and args[0].endswith('...'):
980 log_args = [args[0][:-1]]
981 elif len(args) == 2:
982 log_args = [args[0] + '..' + args[1]]
983 else:
984 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000985 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000986
987
Aaron Gablea45ee112016-11-22 15:14:38 -0800988class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700989 def __init__(self, issue, url):
990 self.issue = issue
991 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800992 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700993
994 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800995 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700996 self.issue, self.url)
997
998
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +0100999_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001000 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001001 # TODO(tandrii): these two aren't known in Gerrit.
1002 'approval', 'disapproval'])
1003
1004
Joanna Wang6215dd02023-02-07 15:58:03 +00001005# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001006_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001007 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001008 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001009])
1010
1011
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001013 """Changelist works with one changelist in local branch.
1014
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001015 Notes:
1016 * Not safe for concurrent multi-{thread,process} use.
1017 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001018 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001019 """
1020
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001021 def __init__(self,
1022 branchref=None,
1023 issue=None,
1024 codereview_host=None,
1025 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001026 """Create a new ChangeList instance.
1027
Edward Lemurf38bc172019-09-03 21:02:13 +00001028 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001029 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001031 global settings
1032 if not settings:
1033 # Happens when git_cl.py is used as a utility library.
1034 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001035
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001036 self.branchref = branchref
1037 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001038 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001039 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 else:
1041 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001042 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001044 self.lookedup_issue = False
1045 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001046 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001047 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001048 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001049 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001050 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001051 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001052 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001053
Edward Lemur125d60a2019-09-13 18:25:41 +00001054 # Lazily cached values.
1055 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1056 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001057 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001058 # Map from change number (issue) to its detail cache.
1059 self._detail_cache = {}
1060
1061 if codereview_host is not None:
1062 assert not codereview_host.startswith('https://'), codereview_host
1063 self._gerrit_host = codereview_host
1064 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001065
Edward Lesmese1576912021-02-16 21:53:34 +00001066 @property
1067 def owners_client(self):
1068 if self._owners_client is None:
1069 remote, remote_branch = self.GetRemoteBranch()
1070 branch = GetTargetRef(remote, remote_branch, None)
1071 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001072 host=self.GetGerritHost(),
1073 project=self.GetGerritProject(),
1074 branch=branch)
1075 return self._owners_client
1076
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001077 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001078 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001079
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001080 The return value is a string suitable for passing to git cl with the --cc
1081 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001082 """
1083 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001084 base_cc = settings.GetDefaultCCList()
1085 more_cc = ','.join(self.more_cc)
1086 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001087 return self.cc
1088
Daniel Cheng7227d212017-11-17 08:12:37 -08001089 def ExtendCC(self, more_cc):
1090 """Extends the list of users to cc on this CL based on the changed files."""
1091 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001093 def GetCommitDate(self):
1094 """Returns the commit date as provided in the constructor"""
1095 return self.commit_date
1096
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001097 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001098 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001100 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001101 if not branchref:
1102 return None
1103 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001104 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105 return self.branch
1106
1107 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001108 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 self.GetBranch() # Poke the lazy loader.
1110 return self.branchref
1111
Edward Lemur85153282020-02-14 22:06:29 +00001112 def _GitGetBranchConfigValue(self, key, default=None):
1113 return scm.GIT.GetBranchConfig(
1114 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001115
Edward Lemur85153282020-02-14 22:06:29 +00001116 def _GitSetBranchConfigValue(self, key, value):
1117 action = 'set %s to %r' % (key, value)
1118 if not value:
1119 action = 'unset %s' % key
1120 assert self.GetBranch(), 'a branch is needed to ' + action
1121 return scm.GIT.SetBranchConfig(
1122 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 @staticmethod
1125 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001126 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001127 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001129 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1130 settings.GetRoot(), branch)
1131 if not remote or not upstream_branch:
1132 DieWithError(
1133 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001134 'Verify this branch is set up to track another \n'
1135 '(via the --track argument to "git checkout -b ..."). \n'
1136 'or pass complete "git diff"-style arguments if supported, like\n'
1137 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138
1139 return remote, upstream_branch
1140
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001141 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001142 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001143 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001144 DieWithError('The upstream for the current branch (%s) does not exist '
1145 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001146 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001147 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001148
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 def GetUpstreamBranch(self):
1150 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001151 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001152 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001153 upstream_branch = upstream_branch.replace('refs/heads/',
1154 'refs/remotes/%s/' % remote)
1155 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1156 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001157 self.upstream_branch = upstream_branch
1158 return self.upstream_branch
1159
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001160 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001161 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001162 remote, branch = None, self.GetBranch()
1163 seen_branches = set()
1164 while branch not in seen_branches:
1165 seen_branches.add(branch)
1166 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001167 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 if remote != '.' or branch.startswith('refs/remotes'):
1169 break
1170 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001171 remotes = RunGit(['remote'], error_ok=True).split()
1172 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001173 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001174 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001176 logging.warning('Could not determine which remote this change is '
1177 'associated with, so defaulting to "%s".' %
1178 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001179 else:
Gavin Make6a62332020-12-04 21:57:10 +00001180 logging.warning('Could not determine which remote this change is '
1181 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001182 branch = 'HEAD'
1183 if branch.startswith('refs/remotes'):
1184 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001185 elif branch.startswith('refs/branch-heads/'):
1186 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001187 else:
1188 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001189 return self._remote
1190
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001191 def GetRemoteUrl(self):
1192 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1193
1194 Returns None if there is no remote.
1195 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001196 is_cached, value = self._cached_remote_url
1197 if is_cached:
1198 return value
1199
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001200 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001201 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001202
Edward Lemur298f2cf2019-02-22 21:40:39 +00001203 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001204 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001205 if host:
1206 self._cached_remote_url = (True, url)
1207 return url
1208
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001209 # If it cannot be parsed as an url, assume it is a local directory,
1210 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001211 logging.warning('"%s" doesn\'t appear to point to a git host. '
1212 'Interpreting it as a local directory.', url)
1213 if not os.path.isdir(url):
1214 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001215 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1216 'but it doesn\'t exist.',
1217 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001218 return None
1219
1220 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001221 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222
Edward Lemur79d4f992019-11-11 23:49:02 +00001223 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001224 if not host:
1225 logging.error(
1226 'Remote "%(remote)s" for branch "%(branch)s" points to '
1227 '"%(cache_path)s", but it is misconfigured.\n'
1228 '"%(cache_path)s" must be a git repo and must have a remote named '
1229 '"%(remote)s" pointing to the git host.', {
1230 'remote': remote,
1231 'cache_path': cache_path,
1232 'branch': self.GetBranch()})
1233 return None
1234
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001235 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001236 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001238 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001239 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001240 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001241 if self.GetBranch():
1242 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001243 if self.issue is not None:
1244 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 return self.issue
1247
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001248 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001250 issue = self.GetIssue()
1251 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001252 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001253 server = self.GetCodereviewServer()
1254 if short:
1255 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1256 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257
Edward Lemur6c6827c2020-02-06 21:15:18 +00001258 def FetchDescription(self, pretty=False):
1259 assert self.GetIssue(), 'issue is required to query Gerrit'
1260
Edward Lemur9aa1a962020-02-25 00:58:38 +00001261 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001262 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1263 current_rev = data['current_revision']
1264 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001265
1266 if not pretty:
1267 return self.description
1268
1269 # Set width to 72 columns + 2 space indent.
1270 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1271 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1272 lines = self.description.splitlines()
1273 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274
1275 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001276 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001277 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001278 if self.GetBranch():
1279 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001280 if self.patchset is not None:
1281 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001282 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 return self.patchset
1284
Edward Lemur9aa1a962020-02-25 00:58:38 +00001285 def GetAuthor(self):
1286 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1287
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001289 """Set this branch's patchset. If patchset=0, clears the patchset."""
1290 assert self.GetBranch()
1291 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001292 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001293 else:
1294 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001295 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001297 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001298 """Set this branch's issue. If issue isn't given, clears the issue."""
1299 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001301 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001302 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001303 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001304 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001305 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001306 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001307 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308 else:
tandrii5d48c322016-08-18 16:19:37 -07001309 # Reset all of these just to be clean.
1310 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001311 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001312 ISSUE_CONFIG_KEY,
1313 PATCHSET_CONFIG_KEY,
1314 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001315 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001316 ]
tandrii5d48c322016-08-18 16:19:37 -07001317 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001318 try:
1319 self._GitSetBranchConfigValue(prop, None)
1320 except subprocess2.CalledProcessError:
1321 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001322 msg = RunGit(['log', '-1', '--format=%B']).strip()
1323 if msg and git_footers.get_footer_change_id(msg):
1324 print('WARNING: The change patched into this branch has a Change-Id. '
1325 'Removing it.')
1326 RunGit(['commit', '--amend', '-m',
1327 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001328 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001329 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001330 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001331
Joanna Wangb46232e2023-01-21 01:58:46 +00001332 def GetAffectedFiles(self, upstream, end_commit=None):
1333 # type: (str, Optional[str]) -> Sequence[str]
1334 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001335 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001336 return [
1337 f for _, f in scm.GIT.CaptureStatus(
1338 settings.GetRoot(), upstream, end_commit=end_commit)
1339 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001340 except subprocess2.CalledProcessError:
1341 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001342 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001343 'This branch probably doesn\'t exist anymore. To reset the\n'
1344 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001345 ' git branch --set-upstream-to origin/main %s\n'
1346 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001347 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001348
dsansomee2d6fd92016-09-08 00:10:47 -07001349 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001350 assert self.GetIssue(), 'issue is required to update description'
1351
1352 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001353 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001354 if not force:
1355 confirm_or_exit(
1356 'The description cannot be modified while the issue has a pending '
1357 'unpublished edit. Either publish the edit in the Gerrit web UI '
1358 'or delete it.\n\n', action='delete the unpublished edit')
1359
1360 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001361 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001362 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001363 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001364 description, notify='NONE')
1365
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001366 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001367
Edward Lemur75526302020-02-27 22:31:05 +00001368 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001369 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001370 '--root', settings.GetRoot(),
1371 '--upstream', upstream,
1372 ]
1373
1374 args.extend(['--verbose'] * verbose)
1375
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001376 remote, remote_branch = self.GetRemoteBranch()
1377 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001378 if settings.GetIsGerrit():
1379 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1380 args.extend(['--gerrit_project', self.GetGerritProject()])
1381 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001382
Edward Lemur99df04e2020-03-05 19:39:43 +00001383 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001384 issue = self.GetIssue()
1385 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001386 if author:
1387 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001388 if issue:
1389 args.extend(['--issue', str(issue)])
1390 if patchset:
1391 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001392
Edward Lemur75526302020-02-27 22:31:05 +00001393 return args
1394
Josip Sokcevic017544d2022-03-31 23:47:53 +00001395 def RunHook(self,
1396 committing,
1397 may_prompt,
1398 verbose,
1399 parallel,
1400 upstream,
1401 description,
1402 all_files,
1403 files=None,
1404 resultdb=False,
1405 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001406 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1407 args = self._GetCommonPresubmitArgs(verbose, upstream)
1408 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001409 if may_prompt:
1410 args.append('--may_prompt')
1411 if parallel:
1412 args.append('--parallel')
1413 if all_files:
1414 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001415 if files:
1416 args.extend(files.split(';'))
1417 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001418 if files or all_files:
1419 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001420
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001421 if resultdb and not realm:
1422 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1423 # it is not required to pass the realm flag
1424 print('Note: ResultDB reporting will NOT be performed because --realm'
1425 ' was not specified. To enable ResultDB, please run the command'
1426 ' again with the --realm argument to specify the LUCI realm.')
1427
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001428 return self._RunPresubmit(args,
1429 description,
1430 resultdb=resultdb,
1431 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001432
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001433 def _RunPresubmit(self,
1434 args,
1435 description,
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001436 resultdb=None,
1437 realm=None):
1438 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1439 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001440 args = args[:]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001441
Edward Lemur227d5102020-02-25 23:45:35 +00001442 with gclient_utils.temporary_file() as description_file:
1443 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001444 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001445 args.extend(['--json_output', json_output])
1446 args.extend(['--description_file', description_file])
Edward Lemur227d5102020-02-25 23:45:35 +00001447 start = time_time()
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001448 cmd = ['vpython3', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001449 if resultdb and realm:
1450 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001451
1452 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001453 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001454
Edward Lemur227d5102020-02-25 23:45:35 +00001455 metrics.collector.add_repeated('sub_commands', {
1456 'command': 'presubmit',
1457 'execution_time': time_time() - start,
1458 'exit_code': exit_code,
1459 })
1460
1461 if exit_code:
1462 sys.exit(exit_code)
1463
1464 json_results = gclient_utils.FileRead(json_output)
1465 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001466
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001467 def RunPostUploadHook(self, verbose, upstream, description):
Edward Lemur75526302020-02-27 22:31:05 +00001468 args = self._GetCommonPresubmitArgs(verbose, upstream)
1469 args.append('--post_upload')
1470
1471 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001472 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001473 args.extend(['--description_file', description_file])
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001474 subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args).wait()
Edward Lemur75526302020-02-27 22:31:05 +00001475
Edward Lemur5a644f82020-03-18 16:44:57 +00001476 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001477 # type: (optparse.Values, Sequence[str], Sequence[str]
1478 # ) -> ChangeDescription
1479 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001480 if self.GetIssue():
1481 description = self.FetchDescription()
1482 elif options.message:
1483 description = options.message
1484 else:
1485 description = _create_description_from_log(git_diff_args)
1486 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001487 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001488
Edward Lemur5a644f82020-03-18 16:44:57 +00001489 bug = options.bug
1490 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001491 if not self.GetIssue():
1492 # Extract bug number from branch name, but only if issue is being created.
1493 # It must start with bug or fix, followed by _ or - and number.
1494 # Optionally, it may contain _ or - after number with arbitrary text.
1495 # Examples:
1496 # bug-123
1497 # bug_123
1498 # fix-123
1499 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001500 branch = self.GetBranch()
1501 if branch is not None:
1502 match = re.match(
1503 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1504 if not bug and not fixed and match:
1505 if match.group('type') == 'bug':
1506 bug = match.group('bugnum')
1507 else:
1508 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001509
1510 change_description = ChangeDescription(description, bug, fixed)
1511
Joanna Wang39811b12023-01-20 23:09:48 +00001512 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001513 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001514 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001515 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001516 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001517 missing_files = [
1518 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001519 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001520 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001521 owners = self.owners_client.SuggestOwners(
1522 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001523 assert isinstance(options.reviewers, list), options.reviewers
1524 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001525
Edward Lemur5a644f82020-03-18 16:44:57 +00001526 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001527 if options.reviewers:
1528 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001529
1530 return change_description
1531
Joanna Wanga1abbed2023-01-24 01:41:05 +00001532 def _GetTitleForUpload(self, options, multi_change_upload=False):
1533 # type: (optparse.Values, Optional[bool]) -> str
1534
1535 # Getting titles for multipl commits is not supported so we return the
1536 # default.
1537 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001538 return options.title
1539
1540 # On first upload, patchset title is always this string, while options.title
1541 # gets converted to first line of message.
1542 if not self.GetIssue():
1543 return 'Initial upload'
1544
1545 # When uploading subsequent patchsets, options.message is taken as the title
1546 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001547 if options.message:
1548 return options.message.strip()
1549
1550 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001551 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001552 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001553 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001554 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001555
1556 # Use the default title if the user confirms the default with a 'y'.
1557 if user_title.lower() == 'y':
1558 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001559 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001560
Joanna Wang562481d2023-01-26 21:57:14 +00001561 def _GetRefSpecOptions(self,
1562 options,
1563 change_desc,
1564 multi_change_upload=False,
1565 dogfood_path=False):
1566 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1567 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001568
1569 # Extra options that can be specified at push time. Doc:
1570 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1571 refspec_opts = []
1572
1573 # By default, new changes are started in WIP mode, and subsequent patchsets
1574 # don't send email. At any time, passing --send-mail or --send-email will
1575 # mark the change ready and send email for that particular patch.
1576 if options.send_mail:
1577 refspec_opts.append('ready')
1578 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001579 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001580 refspec_opts.append('wip')
1581 else:
1582 refspec_opts.append('notify=NONE')
1583
1584 # TODO(tandrii): options.message should be posted as a comment if
1585 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1586 # to do it.
1587
1588 # Set options.title in case user was prompted in _GetTitleForUpload and
1589 # _CMDUploadChange needs to be called again.
1590 options.title = self._GetTitleForUpload(
1591 options, multi_change_upload=multi_change_upload)
1592
1593 if options.title:
1594 # Punctuation and whitespace in |title| must be percent-encoded.
1595 refspec_opts.append('m=' +
1596 gerrit_util.PercentEncodeForGitRef(options.title))
1597
1598 if options.private:
1599 refspec_opts.append('private')
1600
1601 if options.topic:
1602 # Documentation on Gerrit topics is here:
1603 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1604 refspec_opts.append('topic=%s' % options.topic)
1605
1606 if options.enable_auto_submit:
1607 refspec_opts.append('l=Auto-Submit+1')
1608 if options.set_bot_commit:
1609 refspec_opts.append('l=Bot-Commit+1')
1610 if options.use_commit_queue:
1611 refspec_opts.append('l=Commit-Queue+2')
1612 elif options.cq_dry_run:
1613 refspec_opts.append('l=Commit-Queue+1')
Joanna Wanga1abbed2023-01-24 01:41:05 +00001614
1615 if change_desc.get_reviewers(tbr_only=True):
1616 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1617 self.GetGerritProject())
1618 refspec_opts.append('l=Code-Review+%s' % score)
1619
Joanna Wang40497912023-01-24 21:18:16 +00001620 # Gerrit sorts hashtags, so order is not important.
1621 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1622 # We check GetIssue because we only add hashtags from the
1623 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001624 # TODO(b/265929888): When we fully launch the new path:
1625 # 1) remove fetching hashtags from description alltogether
1626 # 2) Or use descrtiption hashtags for:
1627 # `not (self.GetIssue() and multi_change_upload)`
1628 # 3) Or enabled change description tags for multi and single changes
1629 # by adding them post `git push`.
1630 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001631 hashtags.update(change_desc.get_hash_tags())
1632 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001633
1634 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001635 # branch/change.
1636 return refspec_opts
1637
Joanna Wang05b60342023-03-29 20:25:57 +00001638 def PrepareSquashedCommit(self,
1639 options,
1640 parent,
1641 orig_parent,
1642 end_commit=None):
1643 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1644 """Create a squashed commit to upload.
1645
1646
1647 Args:
1648 parent: The commit to use as the parent for the new squashed.
1649 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1650 is part of the same original tree as end_commit, which does not
1651 contain squashed commits. This is used to create the change
1652 description for the new squashed commit with:
1653 `git log orig_parent..end_commit`.
1654 end_commit: The commit to use as the end of the new squashed commit.
1655 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001656
1657 if end_commit is None:
1658 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1659
Joanna Wang05b60342023-03-29 20:25:57 +00001660 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001661 end_commit)
1662 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1663 with gclient_utils.temporary_file() as desc_tempfile:
1664 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1665 commit_to_push = RunGit(
1666 ['commit-tree', latest_tree, '-p', parent, '-F',
1667 desc_tempfile]).strip()
1668
Joanna Wang7603f042023-03-01 22:17:36 +00001669 # Gerrit may or may not update fast enough to return the correct patchset
1670 # number after we push. Get the pre-upload patchset and increment later.
1671 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001672 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001673 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001674
Joanna Wang6215dd02023-02-07 15:58:03 +00001675 def PrepareCherryPickSquashedCommit(self, options, parent):
1676 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001677 """Create a commit cherry-picked on parent to push."""
1678
Joanna Wang6215dd02023-02-07 15:58:03 +00001679 # The `parent` is what we will cherry-pick on top of.
1680 # The `cherry_pick_base` is the beginning range of what
1681 # we are cherry-picking.
1682 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1683 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001684 self.branchref)
1685
1686 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1687 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1688 with gclient_utils.temporary_file() as desc_tempfile:
1689 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001690 commit_to_cp = RunGit([
1691 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1692 desc_tempfile
1693 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001694
Joanna Wang6215dd02023-02-07 15:58:03 +00001695 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001696 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1697 if ret:
1698 RunGit(['cherry-pick', '--abort'])
1699 RunGit(['checkout', '-q', self.branch])
1700 DieWithError('Could not cleanly cherry-pick')
1701
Joanna Wang6215dd02023-02-07 15:58:03 +00001702 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001703 RunGit(['checkout', '-q', self.branch])
1704
Joanna Wang7603f042023-03-01 22:17:36 +00001705 # Gerrit may or may not update fast enough to return the correct patchset
1706 # number after we push. Get the pre-upload patchset and increment later.
1707 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001708 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001709 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001710
Joanna Wangb46232e2023-01-21 01:58:46 +00001711 def _PrepareChange(self, options, parent, end_commit):
1712 # type: (optparse.Values, str, str) ->
1713 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1714 """Prepares the change to be uploaded."""
1715 self.EnsureCanUploadPatchset(options.force)
1716
1717 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1718 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1719 files)
1720
1721 watchlist = watchlists.Watchlists(settings.GetRoot())
1722 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1723 if not options.bypass_hooks:
1724 hook_results = self.RunHook(committing=False,
1725 may_prompt=not options.force,
1726 verbose=options.verbose,
1727 parallel=options.parallel,
1728 upstream=parent,
1729 description=change_desc.description,
1730 all_files=False)
1731 self.ExtendCC(hook_results['more_cc'])
1732
1733 # Update the change description and ensure we have a Change Id.
1734 if self.GetIssue():
1735 if options.edit_description:
1736 change_desc.prompt()
1737 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1738 change_id = change_detail['change_id']
1739 change_desc.ensure_change_id(change_id)
1740
Joanna Wangb46232e2023-01-21 01:58:46 +00001741 else: # No change issue. First time uploading
1742 if not options.force and not options.message_file:
1743 change_desc.prompt()
1744
1745 # Check if user added a change_id in the descripiton.
1746 change_ids = git_footers.get_footer_change_id(change_desc.description)
1747 if len(change_ids) == 1:
1748 change_id = change_ids[0]
1749 else:
1750 change_id = GenerateGerritChangeId(change_desc.description)
1751 change_desc.ensure_change_id(change_id)
1752
1753 if options.preserve_tryjobs:
1754 change_desc.set_preserve_tryjobs()
1755
1756 SaveDescriptionBackup(change_desc)
1757
1758 # Add ccs
1759 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001760 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001761 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001762 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001763 ccs = self.GetCCList().split(',')
1764 if len(ccs) > 100:
1765 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1766 'process/lsc/lsc_workflow.md')
1767 print('WARNING: This will auto-CC %s users.' % len(ccs))
1768 print('LSC may be more appropriate: %s' % lsc)
1769 print('You can also use the --no-autocc flag to disable auto-CC.')
1770 confirm_or_exit(action='continue')
1771
1772 # Add ccs from the --cc flag.
1773 if options.cc:
1774 ccs.extend(options.cc)
1775
1776 ccs = [email.strip() for email in ccs if email.strip()]
1777 if change_desc.get_cced():
1778 ccs.extend(change_desc.get_cced())
1779
1780 return change_desc.get_reviewers(), ccs, change_desc
1781
Joanna Wang40497912023-01-24 21:18:16 +00001782 def PostUploadUpdates(self, options, new_upload, change_number):
1783 # type: (optparse.Values, _NewUpload, change_number) -> None
1784 """Makes necessary post upload changes to the local and remote cl."""
1785 if not self.GetIssue():
1786 self.SetIssue(change_number)
1787
Joanna Wang7603f042023-03-01 22:17:36 +00001788 self.SetPatchset(new_upload.prev_patchset + 1)
1789
Joanna Wang40497912023-01-24 21:18:16 +00001790 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1791 new_upload.commit_to_push)
1792 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1793 new_upload.new_last_uploaded_commit)
1794
1795 if settings.GetRunPostUploadHook():
1796 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001797 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00001798
1799 if new_upload.reviewers or new_upload.ccs:
1800 gerrit_util.AddReviewers(self.GetGerritHost(),
1801 self._GerritChangeIdentifier(),
1802 reviewers=new_upload.reviewers,
1803 ccs=new_upload.ccs,
1804 notify=bool(options.send_mail))
1805
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001806 def CMDUpload(self, options, git_diff_args, orig_args):
1807 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001808 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001809 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001810 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001811 else:
1812 if self.GetBranch() is None:
1813 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1814
1815 # Default to diffing against common ancestor of upstream branch
1816 base_branch = self.GetCommonAncestorWithUpstream()
1817 git_diff_args = [base_branch, 'HEAD']
1818
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001819 # Fast best-effort checks to abort before running potentially expensive
1820 # hooks if uploading is likely to fail anyway. Passing these checks does
1821 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001822 self.EnsureAuthenticated(force=options.force)
1823 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001824
1825 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001826 watchlist = watchlists.Watchlists(settings.GetRoot())
1827 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001828 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001829 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001830
Edward Lemur5a644f82020-03-18 16:44:57 +00001831 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001833 hook_results = self.RunHook(committing=False,
1834 may_prompt=not options.force,
1835 verbose=options.verbose,
1836 parallel=options.parallel,
1837 upstream=base_branch,
1838 description=change_desc.description,
1839 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001840 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001841
Aaron Gable13101a62018-02-09 13:20:41 -08001842 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001843 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001844 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001846 if self.GetBranch() is not None:
1847 self._GitSetBranchConfigValue(
1848 LAST_UPLOAD_HASH_CONFIG_KEY,
1849 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001850 # Run post upload hooks, if specified.
1851 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001852 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001853 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001854
1855 # Upload all dependencies if specified.
1856 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001857 print()
1858 print('--dependencies has been specified.')
1859 print('All dependent local branches will be re-uploaded.')
1860 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001861 # Remove the dependencies flag from args so that we do not end up in a
1862 # loop.
1863 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001864 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001865 return ret
1866
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001867 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001868 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001869
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001870 Issue must have been already uploaded and known.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001871 """
1872 assert new_state in _CQState.ALL_STATES
1873 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001874 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001875 vote_map = {
1876 _CQState.NONE: 0,
1877 _CQState.DRY_RUN: 1,
1878 _CQState.COMMIT: 2,
1879 }
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00001880 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001881 notify = False if new_state == _CQState.DRY_RUN else None
1882 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001883 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001884 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001885 return 0
1886 except KeyboardInterrupt:
1887 raise
1888 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001889 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001890 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001891 ' * Your project has no CQ,\n'
1892 ' * You don\'t have permission to change the CQ state,\n'
1893 ' * There\'s a bug in this code (see stack trace below).\n'
1894 'Consider specifying which bots to trigger manually or asking your '
1895 'project owners for permissions or contacting Chrome Infra at:\n'
1896 'https://www.chromium.org/infra\n\n' %
1897 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001898 # Still raise exception so that stack trace is printed.
1899 raise
1900
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001901 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001902 # Lazy load of configs.
1903 self.GetCodereviewServer()
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001904
tandriie32e3ea2016-06-22 02:52:48 -07001905 if self._gerrit_host and '.' not in self._gerrit_host:
1906 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
Edward Lemur79d4f992019-11-11 23:49:02 +00001907 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001908 if parsed.scheme == 'sso':
tandriie32e3ea2016-06-22 02:52:48 -07001909 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1910 self._gerrit_server = 'https://%s' % self._gerrit_host
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001911
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001912 return self._gerrit_host
1913
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001914 def _GetGitHost(self):
1915 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001916 remote_url = self.GetRemoteUrl()
1917 if not remote_url:
1918 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001919 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001920
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 def GetCodereviewServer(self):
1922 if not self._gerrit_server:
1923 # If we're on a branch then get the server potentially associated
1924 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001925 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001926 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001927 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001928 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001929 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001930 if not self._gerrit_server:
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001931 url = urllib.parse.urlparse(self.GetRemoteUrl())
1932 parts = url.netloc.split('.')
1933
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1935 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 parts[0] = parts[0] + '-review'
Aravind Vasudevan0e3589e2023-05-25 23:00:30 +00001937
1938 if url.scheme == 'sso' and len(parts) == 1:
1939 # sso:// uses abbreivated hosts, eg. sso://chromium instead of
1940 # chromium.googlesource.com. Hence, for code review server, they need
1941 # to be expanded.
1942 parts[0] += '.googlesource.com'
1943
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001944 self._gerrit_host = '.'.join(parts)
1945 self._gerrit_server = 'https://%s' % self._gerrit_host
1946 return self._gerrit_server
1947
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001948 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001949 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001950 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001951 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001952 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001953 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001954 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001955 if project.endswith('.git'):
1956 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001957 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1958 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1959 # gitiles/git-over-https protocol. E.g.,
1960 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1961 # as
1962 # https://chromium.googlesource.com/v8/v8
1963 if project.startswith('a/'):
1964 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001965 return project
1966
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001967 def _GerritChangeIdentifier(self):
1968 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1969
1970 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001971 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001972 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001973 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001974 if project:
1975 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1976 # Fall back on still unique, but less efficient change number.
1977 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001978
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001979 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001980 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001981 if settings.GetGerritSkipEnsureAuthenticated():
1982 # For projects with unusual authentication schemes.
1983 # See http://crbug.com/603378.
1984 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001985
1986 # Check presence of cookies only if using cookies-based auth method.
1987 cookie_auth = gerrit_util.Authenticator.get()
1988 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001989 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001990
Florian Mayerae510e82020-01-30 21:04:48 +00001991 remote_url = self.GetRemoteUrl()
1992 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001993 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001994 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001995 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
1996 logging.warning(
1997 'Ignoring branch %(branch)s with non-https/sso remote '
1998 '%(remote)s', {
1999 'branch': self.branch,
2000 'remote': self.GetRemoteUrl()
2001 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002002 return
2003
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002004 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002005 self.GetCodereviewServer()
2006 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002007 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002008
2009 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2010 git_auth = cookie_auth.get_auth_header(git_host)
2011 if gerrit_auth and git_auth:
2012 if gerrit_auth == git_auth:
2013 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002014 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002015 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002016 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002017 ' %s\n'
2018 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002019 ' Consider running the following command:\n'
2020 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002021 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002022 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002023 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002024 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002025 cookie_auth.get_new_password_message(git_host)))
2026 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002027 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002028 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002029
2030 missing = (
2031 ([] if gerrit_auth else [self._gerrit_host]) +
2032 ([] if git_auth else [git_host]))
2033 DieWithError('Credentials for the following hosts are required:\n'
2034 ' %s\n'
2035 'These are read from %s (or legacy %s)\n'
2036 '%s' % (
2037 '\n '.join(missing),
2038 cookie_auth.get_gitcookies_path(),
2039 cookie_auth.get_netrc_path(),
2040 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002041
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002042 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002043 if not self.GetIssue():
2044 return
2045
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002046 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002047 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002048 DieWithError(
2049 'Change %s has been abandoned, new uploads are not allowed' %
2050 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002051 if status == 'MERGED':
2052 answer = gclient_utils.AskForData(
2053 'Change %s has been submitted, new uploads are not allowed. '
2054 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2055 ).lower()
2056 if answer not in ('y', ''):
2057 DieWithError('New uploads are not allowed.')
2058 self.SetIssue()
2059 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002060
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002061 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2062 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2063 # Apparently this check is not very important? Otherwise get_auth_email
2064 # could have been added to other implementations of Authenticator.
2065 cookies_auth = gerrit_util.Authenticator.get()
2066 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002067 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002068
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002069 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002070 if self.GetIssueOwner() == cookies_user:
2071 return
2072 logging.debug('change %s owner is %s, cookies user is %s',
2073 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002074 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002075 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002076 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002077 if details['email'] == self.GetIssueOwner():
2078 return
2079 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002080 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002081 'as %s.\n'
2082 'Uploading may fail due to lack of permissions.' %
2083 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2084 confirm_or_exit(action='upload')
2085
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002086 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002087 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002088 or CQ status, assuming adherence to a common workflow.
2089
2090 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002091 * 'error' - error from review tool (including deleted issues)
2092 * 'unsent' - no reviewers added
2093 * 'waiting' - waiting for review
2094 * 'reply' - waiting for uploader to reply to review
2095 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002096 * 'dry-run' - dry-running in the CQ
2097 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002098 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002099 """
2100 if not self.GetIssue():
2101 return None
2102
2103 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002104 data = self._GetChangeDetail([
2105 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002106 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002107 return 'error'
2108
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002109 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002110 return 'closed'
2111
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002112 cq_label = data['labels'].get('Commit-Queue', {})
2113 max_cq_vote = 0
2114 for vote in cq_label.get('all', []):
2115 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2116 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002117 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002118 if max_cq_vote == 1:
2119 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002120
Aaron Gable9ab38c62017-04-06 14:36:33 -07002121 if data['labels'].get('Code-Review', {}).get('approved'):
2122 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002123
2124 if not data.get('reviewers', {}).get('REVIEWER', []):
2125 return 'unsent'
2126
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002127 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002128 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002129 while messages:
2130 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002131 if (m.get('tag', '').startswith('autogenerated:cq') or
2132 m.get('tag', '').startswith('autogenerated:cv')):
2133 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002134 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002135 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002136 # Most recent message was by owner.
2137 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002138
2139 # Some reply from non-owner.
2140 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002141
2142 # Somehow there are no messages even though there are reviewers.
2143 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002144
Gavin Mak4e5e3992022-11-14 22:40:12 +00002145 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002146 if not self.GetIssue():
2147 return None
2148
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002149 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002150 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002151 if update:
2152 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002153 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002154
Gavin Makf35a9eb2022-11-17 18:34:36 +00002155 def _IsPatchsetRangeSignificant(self, lower, upper):
2156 """Returns True if the inclusive range of patchsets contains any reworks or
2157 rebases."""
2158 if not self.GetIssue():
2159 return False
2160
2161 data = self._GetChangeDetail(['ALL_REVISIONS'])
2162 ps_kind = {}
2163 for rev_info in data.get('revisions', {}).values():
2164 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2165
2166 for ps in range(lower, upper + 1):
2167 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2168 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2169 return True
2170 return False
2171
Gavin Make61ccc52020-11-13 00:12:57 +00002172 def GetMostRecentDryRunPatchset(self):
2173 """Get patchsets equivalent to the most recent patchset and return
2174 the patchset with the latest dry run. If none have been dry run, return
2175 the latest patchset."""
2176 if not self.GetIssue():
2177 return None
2178
2179 data = self._GetChangeDetail(['ALL_REVISIONS'])
2180 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002181 dry_run = {int(m['_revision_number'])
2182 for m in data.get('messages', [])
2183 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002184
2185 for revision_info in sorted(data.get('revisions', {}).values(),
2186 key=lambda c: c['_number'], reverse=True):
2187 if revision_info['_number'] in dry_run:
2188 patchset = revision_info['_number']
2189 break
2190 if revision_info.get('kind', '') not in \
2191 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2192 break
2193 self.SetPatchset(patchset)
2194 return patchset
2195
Aaron Gable636b13f2017-07-14 10:42:48 -07002196 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002197 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002198 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002199 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002200
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002201 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002202 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002203 # CURRENT_REVISION is included to get the latest patchset so that
2204 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002205 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002206 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2207 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002208 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002209 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002210 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002211 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002212
2213 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002214 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002215 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002216 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002217 line_comments = file_comments.setdefault(path, [])
2218 line_comments.extend(
2219 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002220
2221 # Build dictionary of file comments for easy access and sorting later.
2222 # {author+date: {path: {patchset: {line: url+message}}}}
2223 comments = collections.defaultdict(
2224 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002225
2226 server = self.GetCodereviewServer()
2227 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2228 # /c/ is automatically added by short URL server.
2229 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2230 self.GetIssue())
2231 else:
2232 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2233
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002234 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002235 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002236 tag = comment.get('tag', '')
2237 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002238 continue
2239 key = (comment['author']['email'], comment['updated'])
2240 if comment.get('side', 'REVISION') == 'PARENT':
2241 patchset = 'Base'
2242 else:
2243 patchset = 'PS%d' % comment['patch_set']
2244 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002245 url = ('%s/%s/%s#%s%s' %
2246 (url_prefix, comment['patch_set'], path,
2247 'b' if comment.get('side') == 'PARENT' else '',
2248 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002249 comments[key][path][patchset][line] = (url, comment['message'])
2250
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002251 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002252 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002253 summary = self._BuildCommentSummary(msg, comments, readable)
2254 if summary:
2255 summaries.append(summary)
2256 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002257
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002258 @staticmethod
2259 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002260 if 'email' not in msg['author']:
2261 # Some bot accounts may not have an email associated.
2262 return None
2263
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002264 key = (msg['author']['email'], msg['date'])
2265 # Don't bother showing autogenerated messages that don't have associated
2266 # file or line comments. this will filter out most autogenerated
2267 # messages, but will keep robot comments like those from Tricium.
2268 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2269 if is_autogenerated and not comments.get(key):
2270 return None
2271 message = msg['message']
2272 # Gerrit spits out nanoseconds.
2273 assert len(msg['date'].split('.')[-1]) == 9
2274 date = datetime.datetime.strptime(msg['date'][:-3],
2275 '%Y-%m-%d %H:%M:%S.%f')
2276 if key in comments:
2277 message += '\n'
2278 for path, patchsets in sorted(comments.get(key, {}).items()):
2279 if readable:
2280 message += '\n%s' % path
2281 for patchset, lines in sorted(patchsets.items()):
2282 for line, (url, content) in sorted(lines.items()):
2283 if line:
2284 line_str = 'Line %d' % line
2285 path_str = '%s:%d:' % (path, line)
2286 else:
2287 line_str = 'File comment'
2288 path_str = '%s:0:' % path
2289 if readable:
2290 message += '\n %s, %s: %s' % (patchset, line_str, url)
2291 message += '\n %s\n' % content
2292 else:
2293 message += '\n%s ' % path_str
2294 message += '\n%s\n' % content
2295
2296 return _CommentSummary(
2297 date=date,
2298 message=message,
2299 sender=msg['author']['email'],
2300 autogenerated=is_autogenerated,
2301 # These could be inferred from the text messages and correlated with
2302 # Code-Review label maximum, however this is not reliable.
2303 # Leaving as is until the need arises.
2304 approval=False,
2305 disapproval=False,
2306 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002307
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002308 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002309 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002310 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002311
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002312 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002313 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002314 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002315
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002316 def _GetChangeDetail(self, options=None):
2317 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002319 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002320
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002321 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002322 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002323 options.append('CURRENT_COMMIT')
2324
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002325 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002326 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002327 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002328
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002329 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2330 # Assumption: data fetched before with extra options is suitable
2331 # for return for a smaller set of options.
2332 # For example, if we cached data for
2333 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2334 # and request is for options=[CURRENT_REVISION],
2335 # THEN we can return prior cached data.
2336 if options_set.issubset(cached_options_set):
2337 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002338
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002339 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002340 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002341 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002342 except gerrit_util.GerritError as e:
2343 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002344 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002345 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002346
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002347 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002348 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002349
Gavin Mak4e5e3992022-11-14 22:40:12 +00002350 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002351 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002352 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002353 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2354 self._GerritChangeIdentifier(),
2355 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002356 except gerrit_util.GerritError as e:
2357 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002358 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002359 raise
agable32978d92016-11-01 12:55:02 -07002360 return data
2361
Karen Qian40c19422019-03-13 21:28:29 +00002362 def _IsCqConfigured(self):
2363 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002364 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002365
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002366 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002367 if git_common.is_dirty_git_tree('land'):
2368 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002369
tandriid60367b2016-06-22 05:25:12 -07002370 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002371 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002372 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002373 'which can test and land changes for you. '
2374 'Are you sure you wish to bypass it?\n',
2375 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002376 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002377 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002378 # Note: git diff outputs nothing if there is no diff.
2379 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002380 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002381 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002382 if detail['current_revision'] == last_upload:
2383 differs = False
2384 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002385 print('WARNING: Local branch contents differ from latest uploaded '
2386 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002387 if differs:
2388 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002389 confirm_or_exit(
2390 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2391 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002392 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002393 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002394 upstream = self.GetCommonAncestorWithUpstream()
2395 if self.GetIssue():
2396 description = self.FetchDescription()
2397 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002398 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002399 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002400 committing=True,
2401 may_prompt=not force,
2402 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002403 parallel=parallel,
2404 upstream=upstream,
2405 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002406 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002407 resultdb=resultdb,
2408 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002409
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002410 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002411 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002412 links = self._GetChangeCommit().get('web_links', [])
2413 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002414 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002415 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002416 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002417 return 0
2418
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002419 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2420 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002421 assert parsed_issue_arg.valid
2422
Edward Lemur125d60a2019-09-13 18:25:41 +00002423 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002424
2425 if parsed_issue_arg.hostname:
2426 self._gerrit_host = parsed_issue_arg.hostname
2427 self._gerrit_server = 'https://%s' % self._gerrit_host
2428
tandriic2405f52016-10-10 08:13:15 -07002429 try:
2430 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002431 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002432 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002433
2434 if not parsed_issue_arg.patchset:
2435 # Use current revision by default.
2436 revision_info = detail['revisions'][detail['current_revision']]
2437 patchset = int(revision_info['_number'])
2438 else:
2439 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002440 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002441 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2442 break
2443 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002444 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002445 (parsed_issue_arg.patchset, self.GetIssue()))
2446
Edward Lemur125d60a2019-09-13 18:25:41 +00002447 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002448 if remote_url.endswith('.git'):
2449 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002450 remote_url = remote_url.rstrip('/')
2451
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002452 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002453 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002454
2455 if remote_url != fetch_info['url']:
2456 DieWithError('Trying to patch a change from %s but this repo appears '
2457 'to be %s.' % (fetch_info['url'], remote_url))
2458
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002459 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002460
Joanna Wangc023a632023-01-26 17:59:25 +00002461 # Set issue immediately in case the cherry-pick fails, which happens
2462 # when resolving conflicts.
2463 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002464 self.SetIssue(parsed_issue_arg.issue)
2465
Aaron Gable62619a32017-06-16 08:22:09 -07002466 if force:
2467 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2468 print('Checked out commit for change %i patchset %i locally' %
2469 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002470 elif nocommit:
2471 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2472 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002473 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002474 RunGit(['cherry-pick', 'FETCH_HEAD'])
2475 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002476 (parsed_issue_arg.issue, patchset))
2477 print('Note: this created a local commit which does not have '
2478 'the same hash as the one uploaded for review. This will make '
2479 'uploading changes based on top of this branch difficult.\n'
2480 'If you want to do that, use "git cl patch --force" instead.')
2481
Stefan Zagerd08043c2017-10-12 12:07:02 -07002482 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002483 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002484 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002485 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2486 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002487 else:
2488 print('WARNING: You are in detached HEAD state.\n'
2489 'The patch has been applied to your checkout, but you will not be '
2490 'able to upload a new patch set to the gerrit issue.\n'
2491 'Try using the \'-b\' option if you would like to work on a '
2492 'branch and/or upload a new patch set.')
2493
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002494 return 0
2495
Joanna Wang18de1f62023-01-21 01:24:24 +00002496 @staticmethod
2497 def _GerritCommitMsgHookCheck(offer_removal):
2498 # type: (bool) -> None
2499 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002500 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2501 if not os.path.exists(hook):
2502 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002503 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2504 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002505 data = gclient_utils.FileRead(hook)
2506 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2507 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002508 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002509 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002510 'and may interfere with it in subtle ways.\n'
2511 'We recommend you remove the commit-msg hook.')
2512 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002513 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002514 gclient_utils.rm_file_or_tree(hook)
2515 print('Gerrit commit-msg hook removed.')
2516 else:
2517 print('OK, will keep Gerrit commit-msg hook in place.')
2518
Edward Lemur1b52d872019-05-09 21:12:12 +00002519 def _CleanUpOldTraces(self):
2520 """Keep only the last |MAX_TRACES| traces."""
2521 try:
2522 traces = sorted([
2523 os.path.join(TRACES_DIR, f)
2524 for f in os.listdir(TRACES_DIR)
2525 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2526 and not f.startswith('tmp'))
2527 ])
2528 traces_to_delete = traces[:-MAX_TRACES]
2529 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002530 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002531 except OSError:
2532 print('WARNING: Failed to remove old git traces from\n'
2533 ' %s'
2534 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002535
Edward Lemur5737f022019-05-17 01:24:00 +00002536 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002537 """Zip and write the git push traces stored in traces_dir."""
2538 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002539 traces_zip = trace_name + '-traces'
2540 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002541 # Create a temporary dir to store git config and gitcookies in. It will be
2542 # compressed and stored next to the traces.
2543 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002544 git_info_zip = trace_name + '-git-info'
2545
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002546 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002547
Edward Lemur1b52d872019-05-09 21:12:12 +00002548 git_push_metadata['trace_name'] = trace_name
2549 gclient_utils.FileWrite(
2550 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2551
2552 # Keep only the first 6 characters of the git hashes on the packet
2553 # trace. This greatly decreases size after compression.
2554 packet_traces = os.path.join(traces_dir, 'trace-packet')
2555 if os.path.isfile(packet_traces):
2556 contents = gclient_utils.FileRead(packet_traces)
2557 gclient_utils.FileWrite(
2558 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2559 shutil.make_archive(traces_zip, 'zip', traces_dir)
2560
2561 # Collect and compress the git config and gitcookies.
2562 git_config = RunGit(['config', '-l'])
2563 gclient_utils.FileWrite(
2564 os.path.join(git_info_dir, 'git-config'),
2565 git_config)
2566
2567 cookie_auth = gerrit_util.Authenticator.get()
2568 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2569 gitcookies_path = cookie_auth.get_gitcookies_path()
2570 if os.path.isfile(gitcookies_path):
2571 gitcookies = gclient_utils.FileRead(gitcookies_path)
2572 gclient_utils.FileWrite(
2573 os.path.join(git_info_dir, 'gitcookies'),
2574 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2575 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2576
Edward Lemur1b52d872019-05-09 21:12:12 +00002577 gclient_utils.rmtree(git_info_dir)
2578
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002579 def _RunGitPushWithTraces(self,
2580 refspec,
2581 refspec_opts,
2582 git_push_metadata,
2583 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002584 """Run git push and collect the traces resulting from the execution."""
2585 # Create a temporary directory to store traces in. Traces will be compressed
2586 # and stored in a 'traces' dir inside depot_tools.
2587 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002588 trace_name = os.path.join(
2589 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002590
2591 env = os.environ.copy()
2592 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2593 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002594 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002595 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2596 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2597 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2598
2599 try:
2600 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002601 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002602 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002603 push_cmd = ['git', 'push', remote_url, refspec]
2604 if git_push_options:
2605 for opt in git_push_options:
2606 push_cmd.extend(['-o', opt])
2607
Edward Lemur0f58ae42019-04-30 17:24:12 +00002608 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002609 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002610 env=env,
2611 print_stdout=True,
2612 # Flush after every line: useful for seeing progress when running as
2613 # recipe.
2614 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002615 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002616 except subprocess2.CalledProcessError as e:
2617 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002618 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002619 raise GitPushError(
2620 'Failed to create a change, very likely due to blocked keyword. '
2621 'Please examine output above for the reason of the failure.\n'
2622 'If this is a false positive, you can try to bypass blocked '
2623 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002624 '-o banned-words~skip, e.g.:\n'
2625 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002626 'If git-cl is not working correctly, file a bug under the '
2627 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002628 if 'git push -o nokeycheck' in str(e.stdout):
2629 raise GitPushError(
2630 'Failed to create a change, very likely due to a private key being '
2631 'detected. Please examine output above for the reason of the '
2632 'failure.\n'
2633 'If this is a false positive, you can try to bypass private key '
2634 'detection by using push option '
2635 '-o nokeycheck, e.g.:\n'
2636 'git cl upload -o nokeycheck\n\n'
2637 'If git-cl is not working correctly, file a bug under the '
2638 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002639
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002640 raise GitPushError(
2641 'Failed to create a change. Please examine output above for the '
2642 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002643 'For emergencies, Googlers can escalate to '
2644 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002645 'Hint: run command below to diagnose common Git/Gerrit '
2646 'credential problems:\n'
2647 ' git cl creds-check\n'
2648 '\n'
2649 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2650 'component including the files below.\n'
2651 'Review the files before upload, since they might contain sensitive '
2652 'information.\n'
2653 'Set the Restrict-View-Google label so that they are not publicly '
2654 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002655 finally:
2656 execution_time = time_time() - before_push
2657 metrics.collector.add_repeated('sub_commands', {
2658 'command': 'git push',
2659 'execution_time': execution_time,
2660 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002661 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002662 })
2663
Edward Lemur1b52d872019-05-09 21:12:12 +00002664 git_push_metadata['execution_time'] = execution_time
2665 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002666 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002667
Edward Lemur1b52d872019-05-09 21:12:12 +00002668 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002669 gclient_utils.rmtree(traces_dir)
2670
2671 return push_stdout
2672
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002673 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2674 change_desc):
2675 """Upload the current branch to Gerrit, retry if new remote HEAD is
2676 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002677 remote, remote_branch = self.GetRemoteBranch()
2678 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2679
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002680 try:
2681 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002682 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002683 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002684 # Repository might be in the middle of transition to main branch as
2685 # default, and uploads to old default might be blocked.
2686 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002687 DieWithError(str(e), change_desc)
2688
Josip Sokcevicb631a882021-01-06 18:18:10 +00002689 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2690 self.GetGerritProject())
2691 if project_head == branch:
2692 DieWithError(str(e), change_desc)
2693 branch = project_head
2694
2695 print("WARNING: Fetching remote state and retrying upload to default "
2696 "branch...")
2697 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002698 options.edit_description = False
2699 options.force = True
2700 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002701 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2702 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002703 except GitPushError as e:
2704 DieWithError(str(e), change_desc)
2705
2706 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002707 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002708 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002709 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002710 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002711 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002712 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002713 # User requested to change description
2714 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002715 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002716 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2717 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002718 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002719
2720 # Check if changes outside of this workspace have been uploaded.
2721 current_rev = change_detail['current_revision']
2722 last_uploaded_rev = self._GitGetBranchConfigValue(
2723 GERRIT_SQUASH_HASH_CONFIG_KEY)
2724 if last_uploaded_rev and current_rev != last_uploaded_rev:
2725 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002726 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002727 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002728 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002729 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002730 if len(change_ids) == 1:
2731 change_id = change_ids[0]
2732 else:
2733 change_id = GenerateGerritChangeId(change_desc.description)
2734 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002736 if options.preserve_tryjobs:
2737 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002738
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002739 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002740 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002741 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002742 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002743 with gclient_utils.temporary_file() as desc_tempfile:
2744 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2745 ref_to_push = RunGit(
2746 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002747 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002748 if options.no_add_changeid:
2749 pass
2750 else: # adding Change-Ids is okay.
2751 if not git_footers.get_footer_change_id(change_desc.description):
2752 DownloadGerritHook(False)
2753 change_desc.set_description(
2754 self._AddChangeIdToCommitMessage(change_desc.description,
2755 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002757 # For no-squash mode, we assume the remote called "origin" is the one we
2758 # want. It is not worthwhile to support different workflows for
2759 # no-squash mode.
2760 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002761 # attempt to extract the changeid from the current description
2762 # fail informatively if not possible.
2763 change_id_candidates = git_footers.get_footer_change_id(
2764 change_desc.description)
2765 if not change_id_candidates:
2766 DieWithError("Unable to extract change-id from message.")
2767 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002769 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002770 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2771 ref_to_push)]).splitlines()
2772 if len(commits) > 1:
2773 print('WARNING: This will upload %d commits. Run the following command '
2774 'to see which commits will be uploaded: ' % len(commits))
2775 print('git log %s..%s' % (parent, ref_to_push))
2776 print('You can also use `git squash-branch` to squash these into a '
2777 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002778 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002779
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002780 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002781 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002782 # Add default, watchlist, presubmit ccs if this is the initial upload
2783 # and CL is not private and auto-ccing has not been disabled.
2784 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002785 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002786 if len(cc) > 100:
2787 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2788 'process/lsc/lsc_workflow.md')
2789 print('WARNING: This will auto-CC %s users.' % len(cc))
2790 print('LSC may be more appropriate: %s' % lsc)
2791 print('You can also use the --no-autocc flag to disable auto-CC.')
2792 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002793 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002794 if options.cc:
2795 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002796 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002797 if change_desc.get_cced():
2798 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002799 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002800 valid_accounts = set(reviewers + cc)
2801 # TODO(crbug/877717): relax this for all hosts.
2802 else:
2803 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002804 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002805 logging.info('accounts %s are recognized, %s invalid',
2806 sorted(valid_accounts),
2807 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002808
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002809 # Extra options that can be specified at push time. Doc:
2810 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002811 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002812
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002813 for r in sorted(reviewers):
2814 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002815 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002816 reviewers.remove(r)
2817 else:
2818 # TODO(tandrii): this should probably be a hard failure.
2819 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2820 % r)
2821 for c in sorted(cc):
2822 # refspec option will be rejected if cc doesn't correspond to an
2823 # account, even though REST call to add such arbitrary cc may succeed.
2824 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002825 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002826 cc.remove(c)
2827
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002828 refspec_suffix = ''
2829 if refspec_opts:
2830 refspec_suffix = '%' + ','.join(refspec_opts)
2831 assert ' ' not in refspec_suffix, (
2832 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2833 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002834
Edward Lemur1b52d872019-05-09 21:12:12 +00002835 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002836 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002837 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002838 'change_id': change_id,
2839 'description': change_desc.description,
2840 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002841
Gavin Mak4e5e3992022-11-14 22:40:12 +00002842 # Gerrit may or may not update fast enough to return the correct patchset
2843 # number after we push. Get the pre-upload patchset and increment later.
2844 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2845
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002846 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002847 git_push_metadata,
2848 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002849
2850 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002851 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002852 change_numbers = [m.group(1)
2853 for m in map(regex.match, push_stdout.splitlines())
2854 if m]
2855 if len(change_numbers) != 1:
2856 DieWithError(
2857 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002858 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002859 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002860 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002861 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002862
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002863 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002864 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002865 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002866 gerrit_util.AddReviewers(self.GetGerritHost(),
2867 self._GerritChangeIdentifier(),
2868 reviewers,
2869 cc,
2870 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002871
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002872 return 0
2873
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002874 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2875 change_desc):
2876 """Computes parent of the generated commit to be uploaded to Gerrit.
2877
2878 Returns revision or a ref name.
2879 """
2880 if custom_cl_base:
2881 # Try to avoid creating additional unintended CLs when uploading, unless
2882 # user wants to take this risk.
2883 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2884 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2885 local_ref_of_target_remote])
2886 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002887 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002888 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2889 'If you proceed with upload, more than 1 CL may be created by '
2890 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2891 'If you are certain that specified base `%s` has already been '
2892 'uploaded to Gerrit as another CL, you may proceed.\n' %
2893 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2894 if not force:
2895 confirm_or_exit(
2896 'Do you take responsibility for cleaning up potential mess '
2897 'resulting from proceeding with upload?',
2898 action='upload')
2899 return custom_cl_base
2900
Aaron Gablef97e33d2017-03-30 15:44:27 -07002901 if remote != '.':
2902 return self.GetCommonAncestorWithUpstream()
2903
2904 # If our upstream branch is local, we base our squashed commit on its
2905 # squashed version.
2906 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2907
Aaron Gablef97e33d2017-03-30 15:44:27 -07002908 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002909 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002910 if upstream_branch_name == 'main':
2911 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002912
2913 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002914 # TODO(tandrii): consider checking parent change in Gerrit and using its
2915 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2916 # the tree hash of the parent branch. The upside is less likely bogus
2917 # requests to reupload parent change just because it's uploadhash is
2918 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002919 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2920 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002921 # Verify that the upstream branch has been uploaded too, otherwise
2922 # Gerrit will create additional CLs when uploading.
2923 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2924 RunGitSilent(['rev-parse', parent + ':'])):
2925 DieWithError(
2926 '\nUpload upstream branch %s first.\n'
2927 'It is likely that this branch has been rebased since its last '
2928 'upload, so you just need to upload it again.\n'
2929 '(If you uploaded it with --no-squash, then branch dependencies '
2930 'are not supported, and you should reupload with --squash.)'
2931 % upstream_branch_name,
2932 change_desc)
2933 return parent
2934
Gavin Mak4e5e3992022-11-14 22:40:12 +00002935 def _UpdateWithExternalChanges(self):
2936 """Updates workspace with external changes.
2937
2938 Returns the commit hash that should be used as the merge base on upload.
2939 """
2940 local_ps = self.GetPatchset()
2941 if local_ps is None:
2942 return
2943
2944 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002945 if external_ps is None or local_ps == external_ps or \
2946 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002947 return
2948
2949 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002950 if num_changes > 1:
2951 change_words = 'changes were'
2952 else:
2953 change_words = 'change was'
2954 print('\n%d external %s published to %s:\n' %
2955 (num_changes, change_words, self.GetIssueURL(short=True)))
2956
2957 # Print an overview of external changes.
2958 ps_to_commit = {}
2959 ps_to_info = {}
2960 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2961 for commit_id, revision_info in revisions.get('revisions', {}).items():
2962 ps_num = revision_info['_number']
2963 ps_to_commit[ps_num] = commit_id
2964 ps_to_info[ps_num] = revision_info
2965
2966 for ps in range(external_ps, local_ps, -1):
2967 commit = ps_to_commit[ps][:8]
2968 desc = ps_to_info[ps].get('description', '')
2969 print('Patchset %d [%s] %s' % (ps, commit, desc))
2970
Josip Sokcevic43ceaf02023-05-25 15:56:00 +00002971 print('\nSee diff at: %s/%d..%d' %
2972 (self.GetIssueURL(short=True), local_ps, external_ps))
2973 print('\nUploading without applying patches will override them.')
2974
2975 if not ask_for_explicit_yes('Get the latest changes and apply on top?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002976 return
2977
2978 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2979 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2980 external_base = external_parent['commit']
2981
2982 branch = git_common.current_branch()
2983 local_base = self.GetCommonAncestorWithUpstream()
2984 if local_base != external_base:
2985 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2986 (local_base, external_base))
2987 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00002988 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2989 'Continue with upload and override the latest changes?')
2990 return
2991 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00002992
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00002993 external_parent_last_uploaded = self._GetChangeCommit(
2994 revision=local_ps)['parents'][0]
2995 external_base_last_uploaded = external_parent_last_uploaded['commit']
2996
2997 if external_base != external_base_last_uploaded:
2998 print('\nPatch set merge bases are different (%s, %s).\n' %
2999 (external_base_last_uploaded, external_base))
3000 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3001 'Continue with upload and override the latest changes?')
3002 return
3003
Gavin Mak4e5e3992022-11-14 22:40:12 +00003004 # Fetch Gerrit's CL base if it doesn't exist locally.
3005 remote, _ = self.GetRemoteBranch()
3006 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3007 RunGitSilent(['fetch', remote, external_base])
3008
3009 # Get the diff between local_ps and external_ps.
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003010 print('Fetching changes...')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003011 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003012 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003013 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3014 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3015 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3016 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
Josip Sokcevic2568d4c2023-05-24 03:37:42 +00003017
3018 # If the commit parents are different, don't apply the diff as it very
3019 # likely contains many more changes not relevant to this CL.
3020 parents = RunGitSilent(
3021 ['rev-parse',
3022 '%s~1' % (last_uploaded),
3023 '%s~1' % (latest_external)]).strip().split()
3024 assert len(parents) == 2, 'Expected two parents.'
3025 if parents[0] != parents[1]:
3026 confirm_or_exit(
3027 'Can\'t apply the latest changes from Gerrit (parent mismatch '
3028 'between PS).\n'
3029 'Continue with upload and override the latest changes?')
3030 return
3031
Gavin Mak4e5e3992022-11-14 22:40:12 +00003032 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3033
3034 # Diff can be empty in the case of trivial rebases.
3035 if not diff:
3036 return external_base
3037
3038 # Apply the diff.
3039 with gclient_utils.temporary_file() as diff_tempfile:
3040 gclient_utils.FileWrite(diff_tempfile, diff)
3041 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3042 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3043 if not clean_patch:
3044 # Normally patchset is set after upload. But because we exit, that never
3045 # happens. Updating here makes sure that subsequent uploads don't need
3046 # to fetch/apply the same diff again.
3047 self.SetPatchset(external_ps)
3048 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3049 'conflicts and reupload.')
3050
3051 message = 'Incorporate external changes from '
3052 if num_changes == 1:
3053 message += 'patchset %d' % external_ps
3054 else:
3055 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3056 RunGitSilent(['commit', '-am', message])
3057 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3058 # patchset title instead of this 'Incorporate' message.
3059 return external_base
3060
Edward Lemura12175c2020-03-09 16:58:26 +00003061 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003062 """Re-commits using the current message, assumes the commit hook is in
3063 place.
3064 """
Edward Lemura12175c2020-03-09 16:58:26 +00003065 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003066 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003067 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003068 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003069 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003070
3071 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003072
tandriie113dfd2016-10-11 10:20:12 -07003073 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003074 try:
3075 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003076 except GerritChangeNotExists:
3077 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003078
3079 if data['status'] in ('ABANDONED', 'MERGED'):
3080 return 'CL %s is closed' % self.GetIssue()
3081
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003082 def GetGerritChange(self, patchset=None):
3083 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003084 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003085 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003086 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003087 data = self._GetChangeDetail(['ALL_REVISIONS'])
3088
3089 assert host and issue and patchset, 'CL must be uploaded first'
3090
3091 has_patchset = any(
3092 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003093 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003094 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003095 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003096 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003097
tandrii8c5a3532016-11-04 07:52:02 -07003098 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003099 'host': host,
3100 'change': issue,
3101 'project': data['project'],
3102 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003103 }
tandriie113dfd2016-10-11 10:20:12 -07003104
tandriide281ae2016-10-12 06:02:30 -07003105 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003106 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003107
Edward Lemur707d70b2018-02-07 00:50:14 +01003108 def GetReviewers(self):
3109 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003110 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003111
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003112
Lei Zhang8a0efc12020-08-05 19:58:45 +00003113def _get_bug_line_values(default_project_prefix, bugs):
3114 """Given default_project_prefix and comma separated list of bugs, yields bug
3115 line values.
tandriif9aefb72016-07-01 09:06:51 -07003116
3117 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003118 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003119 * string, which is left as is.
3120
3121 This function may produce more than one line, because bugdroid expects one
3122 project per line.
3123
Lei Zhang8a0efc12020-08-05 19:58:45 +00003124 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003125 ['v8:123', 'chromium:789']
3126 """
3127 default_bugs = []
3128 others = []
3129 for bug in bugs.split(','):
3130 bug = bug.strip()
3131 if bug:
3132 try:
3133 default_bugs.append(int(bug))
3134 except ValueError:
3135 others.append(bug)
3136
3137 if default_bugs:
3138 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003139 if default_project_prefix:
3140 if not default_project_prefix.endswith(':'):
3141 default_project_prefix += ':'
3142 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003143 else:
3144 yield default_bugs
3145 for other in sorted(others):
3146 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3147 yield other
3148
3149
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003150class ChangeDescription(object):
3151 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003152 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003153 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003154 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003155 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003156 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003157 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3158 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003159 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003160 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003161
Dan Beamd8b04ca2019-10-10 21:23:26 +00003162 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003163 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003164 if bug:
3165 regexp = re.compile(self.BUG_LINE)
3166 prefix = settings.GetBugPrefix()
3167 if not any((regexp.match(line) for line in self._description_lines)):
3168 values = list(_get_bug_line_values(prefix, bug))
3169 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003170 if fixed:
3171 regexp = re.compile(self.FIXED_LINE)
3172 prefix = settings.GetBugPrefix()
3173 if not any((regexp.match(line) for line in self._description_lines)):
3174 values = list(_get_bug_line_values(prefix, fixed))
3175 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003176
agable@chromium.org42c20792013-09-12 17:34:49 +00003177 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003178 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003179 return '\n'.join(self._description_lines)
3180
3181 def set_description(self, desc):
3182 if isinstance(desc, basestring):
3183 lines = desc.splitlines()
3184 else:
3185 lines = [line.rstrip() for line in desc]
3186 while lines and not lines[0]:
3187 lines.pop(0)
3188 while lines and not lines[-1]:
3189 lines.pop(-1)
3190 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003191
Edward Lemur5a644f82020-03-18 16:44:57 +00003192 def ensure_change_id(self, change_id):
3193 description = self.description
3194 footer_change_ids = git_footers.get_footer_change_id(description)
3195 # Make sure that the Change-Id in the description matches the given one.
3196 if footer_change_ids != [change_id]:
3197 if footer_change_ids:
3198 # Remove any existing Change-Id footers since they don't match the
3199 # expected change_id footer.
3200 description = git_footers.remove_footer(description, 'Change-Id')
3201 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3202 'if you want to set a new one.')
3203 # Add the expected Change-Id footer.
3204 description = git_footers.add_footer_change_id(description, change_id)
3205 self.set_description(description)
3206
Joanna Wang39811b12023-01-20 23:09:48 +00003207 def update_reviewers(self, reviewers):
3208 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003209
3210 Args:
3211 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003212 """
Joanna Wang39811b12023-01-20 23:09:48 +00003213 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003215
3216 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003217
Joanna Wang39811b12023-01-20 23:09:48 +00003218 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003219 regexp = re.compile(self.R_LINE)
3220 matches = [regexp.match(line) for line in self._description_lines]
3221 new_desc = [l for i, l in enumerate(self._description_lines)
3222 if not matches[i]]
3223 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003224
Joanna Wang39811b12023-01-20 23:09:48 +00003225 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003226
Joanna Wang39811b12023-01-20 23:09:48 +00003227 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003228 for match in matches:
3229 if not match:
3230 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003231 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003232
Joanna Wang39811b12023-01-20 23:09:48 +00003233 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003234
3235 # Put the new lines in the description where the old first R= line was.
3236 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3237 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003238 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003239 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003240 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003241
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003242 def set_preserve_tryjobs(self):
3243 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3244 footers = git_footers.parse_footers(self.description)
3245 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3246 if v.lower() == 'true':
3247 return
3248 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3249
Anthony Polito8b955342019-09-24 19:01:36 +00003250 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003251 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003252 self.set_description([
3253 '# Enter a description of the change.',
3254 '# This will be displayed on the codereview site.',
3255 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003256 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003257 '--------------------',
3258 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003259 bug_regexp = re.compile(self.BUG_LINE)
3260 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003261 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003262 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003263
Dan Beamd8b04ca2019-10-10 21:23:26 +00003264 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003265 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003266
Bruce Dawsonfc487042020-10-27 19:11:37 +00003267 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003268 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003269 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003270 if not content:
3271 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003272 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003273
Bruce Dawson2377b012018-01-11 16:46:49 -08003274 # Strip off comments and default inserted "Bug:" line.
3275 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003276 (line.startswith('#') or
3277 line.rstrip() == "Bug:" or
3278 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003279 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003280 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003281 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003282
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003283 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003284 """Adds a footer line to the description.
3285
3286 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3287 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3288 that Gerrit footers are always at the end.
3289 """
3290 parsed_footer_line = git_footers.parse_footer(line)
3291 if parsed_footer_line:
3292 # Line is a gerrit footer in the form: Footer-Key: any value.
3293 # Thus, must be appended observing Gerrit footer rules.
3294 self.set_description(
3295 git_footers.add_footer(self.description,
3296 key=parsed_footer_line[0],
3297 value=parsed_footer_line[1]))
3298 return
3299
3300 if not self._description_lines:
3301 self._description_lines.append(line)
3302 return
3303
3304 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3305 if gerrit_footers:
3306 # git_footers.split_footers ensures that there is an empty line before
3307 # actual (gerrit) footers, if any. We have to keep it that way.
3308 assert top_lines and top_lines[-1] == ''
3309 top_lines, separator = top_lines[:-1], top_lines[-1:]
3310 else:
3311 separator = [] # No need for separator if there are no gerrit_footers.
3312
3313 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003314 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3315 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003316 top_lines.append('')
3317 top_lines.append(line)
3318 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003319
tandrii99a72f22016-08-17 14:33:24 -07003320 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003321 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003322 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003323 reviewers = [match.group(2).strip()
3324 for match in matches
3325 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003326 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003327
bradnelsond975b302016-10-23 12:20:23 -07003328 def get_cced(self):
3329 """Retrieves the list of reviewers."""
3330 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3331 cced = [match.group(2).strip() for match in matches if match]
3332 return cleanup_list(cced)
3333
Nodir Turakulov23b82142017-11-16 11:04:25 -08003334 def get_hash_tags(self):
3335 """Extracts and sanitizes a list of Gerrit hashtags."""
3336 subject = (self._description_lines or ('',))[0]
3337 subject = re.sub(
3338 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3339
3340 tags = []
3341 start = 0
3342 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3343 while True:
3344 m = bracket_exp.match(subject, start)
3345 if not m:
3346 break
3347 tags.append(self.sanitize_hash_tag(m.group(1)))
3348 start = m.end()
3349
3350 if not tags:
3351 # Try "Tag: " prefix.
3352 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3353 if m:
3354 tags.append(self.sanitize_hash_tag(m.group(1)))
3355 return tags
3356
3357 @classmethod
3358 def sanitize_hash_tag(cls, tag):
3359 """Returns a sanitized Gerrit hash tag.
3360
3361 A sanitized hashtag can be used as a git push refspec parameter value.
3362 """
3363 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3364
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003365
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003366def FindCodereviewSettingsFile(filename='codereview.settings'):
3367 """Finds the given file starting in the cwd and going up.
3368
3369 Only looks up to the top of the repository unless an
3370 'inherit-review-settings-ok' file exists in the root of the repository.
3371 """
3372 inherit_ok_file = 'inherit-review-settings-ok'
3373 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003374 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003375 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003376 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003378 if os.path.isfile(os.path.join(cwd, filename)):
3379 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380 if cwd == root:
3381 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003382 parent_dir = os.path.dirname(cwd)
3383 if parent_dir == cwd:
3384 # We hit the system root directory.
3385 break
3386 cwd = parent_dir
3387 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003388
3389
3390def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003391 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003392 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003394 def SetProperty(name, setting, unset_error_ok=False):
3395 fullname = 'rietveld.' + name
3396 if setting in keyvals:
3397 RunGit(['config', fullname, keyvals[setting]])
3398 else:
3399 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3400
tandrii48df5812016-10-17 03:55:37 -07003401 if not keyvals.get('GERRIT_HOST', False):
3402 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003403 # Only server setting is required. Other settings can be absent.
3404 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003405 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3407 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003408 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003409 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3410 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003411 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3412 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003413 SetProperty(
3414 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003415
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003416 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003417 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003418
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003419 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003420 RunGit(['config', 'gerrit.squash-uploads',
3421 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003422
tandrii@chromium.org28253532016-04-14 13:46:56 +00003423 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003424 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003425 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3426
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003427 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003428 # should be of the form
3429 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3430 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003431 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3432 keyvals['ORIGIN_URL_CONFIG']])
3433
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003434
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003435def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003436 """Downloads a network object to a local file, like urllib.urlretrieve.
3437
3438 This is necessary because urllib is broken for SSL connections via a proxy.
3439 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003440 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003441 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003442
3443
ukai@chromium.org712d6102013-11-27 00:52:58 +00003444def hasSheBang(fname):
3445 """Checks fname is a #! script."""
3446 with open(fname) as f:
3447 return f.read(2).startswith('#!')
3448
3449
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003450def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003451 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003452
3453 Args:
3454 force: True to update hooks. False to install hooks if not present.
3455 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003456 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003457 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3458 if not os.access(dst, os.X_OK):
3459 if os.path.exists(dst):
3460 if not force:
3461 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003462 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003463 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003464 if not hasSheBang(dst):
3465 DieWithError('Not a script: %s\n'
3466 'You need to download from\n%s\n'
3467 'into .git/hooks/commit-msg and '
3468 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003469 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3470 except Exception:
3471 if os.path.exists(dst):
3472 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003473 DieWithError('\nFailed to download hooks.\n'
3474 'You need to download from\n%s\n'
3475 'into .git/hooks/commit-msg and '
3476 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003477
3478
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003479class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003480 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003481
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003482 def __init__(self):
3483 # Cached list of [host, identity, source], where source is either
3484 # .gitcookies or .netrc.
3485 self._all_hosts = None
3486
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003487 def ensure_configured_gitcookies(self):
3488 """Runs checks and suggests fixes to make git use .gitcookies from default
3489 path."""
3490 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3491 configured_path = RunGitSilent(
3492 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003493 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003494 if configured_path:
3495 self._ensure_default_gitcookies_path(configured_path, default)
3496 else:
3497 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003498
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003499 @staticmethod
3500 def _ensure_default_gitcookies_path(configured_path, default_path):
3501 assert configured_path
3502 if configured_path == default_path:
3503 print('git is already configured to use your .gitcookies from %s' %
3504 configured_path)
3505 return
3506
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003507 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003508 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3509 (configured_path, default_path))
3510
3511 if not os.path.exists(configured_path):
3512 print('However, your configured .gitcookies file is missing.')
3513 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3514 action='reconfigure')
3515 RunGit(['config', '--global', 'http.cookiefile', default_path])
3516 return
3517
3518 if os.path.exists(default_path):
3519 print('WARNING: default .gitcookies file already exists %s' %
3520 default_path)
3521 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3522 default_path)
3523
3524 confirm_or_exit('Move existing .gitcookies to default location?',
3525 action='move')
3526 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003527 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003528 print('Moved and reconfigured git to use .gitcookies from %s' %
3529 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003530
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003531 @staticmethod
3532 def _configure_gitcookies_path(default_path):
3533 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3534 if os.path.exists(netrc_path):
3535 print('You seem to be using outdated .netrc for git credentials: %s' %
3536 netrc_path)
3537 print('This tool will guide you through setting up recommended '
3538 '.gitcookies store for git credentials.\n'
3539 '\n'
3540 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3541 ' git config --global --unset http.cookiefile\n'
3542 ' mv %s %s.backup\n\n' % (default_path, default_path))
3543 confirm_or_exit(action='setup .gitcookies')
3544 RunGit(['config', '--global', 'http.cookiefile', default_path])
3545 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003546
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003547 def get_hosts_with_creds(self, include_netrc=False):
3548 if self._all_hosts is None:
3549 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003550 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3551 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3552 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3553 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003554
3555 if include_netrc:
3556 return self._all_hosts
3557 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3558
3559 def print_current_creds(self, include_netrc=False):
3560 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3561 if not hosts:
3562 print('No Git/Gerrit credentials found')
3563 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003564 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003565 header = [('Host', 'User', 'Which file'),
3566 ['=' * l for l in lengths]]
3567 for row in (header + hosts):
3568 print('\t'.join((('%%+%ds' % l) % s)
3569 for l, s in zip(lengths, row)))
3570
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003571 @staticmethod
3572 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003573 """Parses identity "git-<username>.domain" into <username> and domain."""
3574 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003575 # distinguishable from sub-domains. But we do know typical domains:
3576 if identity.endswith('.chromium.org'):
3577 domain = 'chromium.org'
3578 username = identity[:-len('.chromium.org')]
3579 else:
3580 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003581 if username.startswith('git-'):
3582 username = username[len('git-'):]
3583 return username, domain
3584
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003585 def has_generic_host(self):
3586 """Returns whether generic .googlesource.com has been configured.
3587
3588 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3589 """
3590 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003591 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003592 return True
3593 return False
3594
3595 def _get_git_gerrit_identity_pairs(self):
3596 """Returns map from canonic host to pair of identities (Git, Gerrit).
3597
3598 One of identities might be None, meaning not configured.
3599 """
3600 host_to_identity_pairs = {}
3601 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003602 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003603 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3604 idx = 0 if canonical == host else 1
3605 pair[idx] = identity
3606 return host_to_identity_pairs
3607
3608 def get_partially_configured_hosts(self):
3609 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003610 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003611 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003612 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003613
3614 def get_conflicting_hosts(self):
3615 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003616 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003617 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003618 if None not in (i1, i2) and i1 != i2)
3619
3620 def get_duplicated_hosts(self):
3621 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003622 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003623
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003624
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003625 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003626 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003627 hosts = sorted(hosts)
3628 assert hosts
3629 if extra_column_func is None:
3630 extras = [''] * len(hosts)
3631 else:
3632 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003633 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3634 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003635 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003636 lines.append(tmpl % he)
3637 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003638
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003639 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003640 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 yield ('.googlesource.com wildcard record detected',
3642 ['Chrome Infrastructure team recommends to list full host names '
3643 'explicitly.'],
3644 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003645
3646 dups = self.get_duplicated_hosts()
3647 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003648 yield ('The following hosts were defined twice',
3649 self._format_hosts(dups),
3650 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003651
3652 partial = self.get_partially_configured_hosts()
3653 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003654 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3655 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003656 self._format_hosts(
3657 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3658 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003659
3660 conflicting = self.get_conflicting_hosts()
3661 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003662 yield ('The following Git hosts have differing credentials from their '
3663 'Gerrit counterparts',
3664 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3665 tuple(self._get_git_gerrit_identity_pairs()[host])),
3666 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003667
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003668 def find_and_report_problems(self):
3669 """Returns True if there was at least one problem, else False."""
3670 found = False
3671 bad_hosts = set()
3672 for title, sublines, hosts in self._find_problems():
3673 if not found:
3674 found = True
3675 print('\n\n.gitcookies problem report:\n')
3676 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003677 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003678 if sublines:
3679 print()
3680 print(' %s' % '\n '.join(sublines))
3681 print()
3682
3683 if bad_hosts:
3684 assert found
3685 print(' You can manually remove corresponding lines in your %s file and '
3686 'visit the following URLs with correct account to generate '
3687 'correct credential lines:\n' %
3688 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003689 print(' %s' % '\n '.join(
3690 sorted(
3691 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3692 _canonical_git_googlesource_host(host))
3693 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003694 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003695
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003696
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003697@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003698def CMDcreds_check(parser, args):
3699 """Checks credentials and suggests changes."""
3700 _, _ = parser.parse_args(args)
3701
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003702 # Code below checks .gitcookies. Abort if using something else.
3703 authn = gerrit_util.Authenticator.get()
3704 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003705 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003706 'This command is not designed for bot environment. It checks '
3707 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003708 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3709 if isinstance(authn, gerrit_util.GceAuthenticator):
3710 message += (
3711 '\n'
3712 'If you need to run this on GCE or a cloudtop instance, '
3713 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3714 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003715
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003716 checker = _GitCookiesChecker()
3717 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003718
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003719 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003720 checker.print_current_creds(include_netrc=True)
3721
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003722 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003723 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003724 return 0
3725 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003726
3727
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003728@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003729def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003730 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003731 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003732 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003733 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003734 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003735 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003736 return RunGit(['config', 'branch.%s.base-url' % branch],
3737 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003738
3739 print('Setting base-url to %s' % args[0])
3740 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3741 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003742
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003743
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003744def color_for_status(status):
3745 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003746 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003747 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003748 'unsent': BOLD + Fore.YELLOW,
3749 'waiting': BOLD + Fore.RED,
3750 'reply': BOLD + Fore.YELLOW,
3751 'not lgtm': BOLD + Fore.RED,
3752 'lgtm': BOLD + Fore.GREEN,
3753 'commit': BOLD + Fore.MAGENTA,
3754 'closed': BOLD + Fore.CYAN,
3755 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003756 }.get(status, Fore.WHITE)
3757
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003758
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003759def get_cl_statuses(changes, fine_grained, max_processes=None):
3760 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003761
3762 If fine_grained is true, this will fetch CL statuses from the server.
3763 Otherwise, simply indicate if there's a matching url for the given branches.
3764
3765 If max_processes is specified, it is used as the maximum number of processes
3766 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3767 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003768
3769 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003770 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003771 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003772 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003773
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003774 if not fine_grained:
3775 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003776 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003777 for cl in changes:
3778 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003779 return
3780
3781 # First, sort out authentication issues.
3782 logging.debug('ensuring credentials exist')
3783 for cl in changes:
3784 cl.EnsureAuthenticated(force=False, refresh=True)
3785
3786 def fetch(cl):
3787 try:
3788 return (cl, cl.GetStatus())
3789 except:
3790 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003791 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003792 raise
3793
3794 threads_count = len(changes)
3795 if max_processes:
3796 threads_count = max(1, min(threads_count, max_processes))
3797 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3798
Edward Lemur61bf4172020-02-24 23:22:37 +00003799 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003800 fetched_cls = set()
3801 try:
3802 it = pool.imap_unordered(fetch, changes).__iter__()
3803 while True:
3804 try:
3805 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003806 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003807 break
3808 fetched_cls.add(cl)
3809 yield cl, status
3810 finally:
3811 pool.close()
3812
3813 # Add any branches that failed to fetch.
3814 for cl in set(changes) - fetched_cls:
3815 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003816
rmistry@google.com2dd99862015-06-22 12:22:18 +00003817
Jose Lopes3863fc52020-04-07 17:00:25 +00003818def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003819 """Uploads CLs of local branches that are dependents of the current branch.
3820
3821 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003822
3823 test1 -> test2.1 -> test3.1
3824 -> test3.2
3825 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003826
3827 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3828 run on the dependent branches in this order:
3829 test2.1, test3.1, test3.2, test2.2, test3.3
3830
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003831 Note: This function does not rebase your local dependent branches. Use it
3832 when you make a change to the parent branch that will not conflict
3833 with its dependent branches, and you would like their dependencies
3834 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003835 """
3836 if git_common.is_dirty_git_tree('upload-branch-deps'):
3837 return 1
3838
3839 root_branch = cl.GetBranch()
3840 if root_branch is None:
3841 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3842 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003843 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003844 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3845 'patchset dependencies without an uploaded CL.')
3846
3847 branches = RunGit(['for-each-ref',
3848 '--format=%(refname:short) %(upstream:short)',
3849 'refs/heads'])
3850 if not branches:
3851 print('No local branches found.')
3852 return 0
3853
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003854 # Create a dictionary of all local branches to the branches that are
3855 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003856 tracked_to_dependents = collections.defaultdict(list)
3857 for b in branches.splitlines():
3858 tokens = b.split()
3859 if len(tokens) == 2:
3860 branch_name, tracked = tokens
3861 tracked_to_dependents[tracked].append(branch_name)
3862
vapiera7fbd5a2016-06-16 09:17:49 -07003863 print()
3864 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003865 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003866
rmistry@google.com2dd99862015-06-22 12:22:18 +00003867 def traverse_dependents_preorder(branch, padding=''):
3868 dependents_to_process = tracked_to_dependents.get(branch, [])
3869 padding += ' '
3870 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003872 dependents.append(dependent)
3873 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003874
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003876 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003877
3878 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003879 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880 return 0
3881
rmistry@google.com2dd99862015-06-22 12:22:18 +00003882 # Record all dependents that failed to upload.
3883 failures = {}
3884 # Go through all dependents, checkout the branch and upload.
3885 try:
3886 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print()
3888 print('--------------------------------------')
3889 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003891 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003892 try:
3893 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003894 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003895 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003896 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003897 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003899 finally:
3900 # Swap back to the original root branch.
3901 RunGit(['checkout', '-q', root_branch])
3902
vapiera7fbd5a2016-06-16 09:17:49 -07003903 print()
3904 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905 for dependent_branch in dependents:
3906 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003907 print(' %s : %s' % (dependent_branch, upload_status))
3908 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003909
3910 return 0
3911
3912
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003913def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003914 """Given a proposed tag name, returns a tag name that is guaranteed to be
3915 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3916 or 'foo-3', and so on."""
3917
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003918 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003919 for suffix_num in itertools.count(1):
3920 if suffix_num == 1:
3921 to_check = proposed_tag
3922 else:
3923 to_check = '%s-%d' % (proposed_tag, suffix_num)
3924
3925 if to_check not in existing_tags:
3926 return to_check
3927
3928
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003929@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003930def CMDarchive(parser, args):
3931 """Archives and deletes branches associated with closed changelists."""
3932 parser.add_option(
3933 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003934 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003935 parser.add_option(
3936 '-f', '--force', action='store_true',
3937 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003938 parser.add_option(
3939 '-d', '--dry-run', action='store_true',
3940 help='Skip the branch tagging and removal steps.')
3941 parser.add_option(
3942 '-t', '--notags', action='store_true',
3943 help='Do not tag archived branches. '
3944 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003945 parser.add_option(
3946 '-p',
3947 '--pattern',
3948 default='git-cl-archived-{issue}-{branch}',
3949 help='Format string for archive tags. '
3950 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003951
kmarshall3bff56b2016-06-06 18:31:47 -07003952 options, args = parser.parse_args(args)
3953 if args:
3954 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003955
3956 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3957 if not branches:
3958 return 0
3959
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003960 tags = RunGit(['for-each-ref', '--format=%(refname)',
3961 'refs/tags']).splitlines() or []
3962 tags = [t.split('/')[-1] for t in tags]
3963
vapiera7fbd5a2016-06-16 09:17:49 -07003964 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003965 changes = [Changelist(branchref=b)
3966 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003967 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3968 statuses = get_cl_statuses(changes,
3969 fine_grained=True,
3970 max_processes=options.maxjobs)
3971 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003972 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3973 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003974 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003975 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003976 proposal.sort()
3977
3978 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003979 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003980 return 0
3981
Edward Lemur85153282020-02-14 22:06:29 +00003982 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003983
vapiera7fbd5a2016-06-16 09:17:49 -07003984 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003985 if options.notags:
3986 for next_item in proposal:
3987 print(' ' + next_item[0])
3988 else:
3989 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3990 for next_item in proposal:
3991 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003992
kmarshall9249e012016-08-23 12:02:16 -07003993 # Quit now on precondition failure or if instructed by the user, either
3994 # via an interactive prompt or by command line flags.
3995 if options.dry_run:
3996 print('\nNo changes were made (dry run).\n')
3997 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003998
3999 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004000 print('You are currently on a branch \'%s\' which is associated with a '
4001 'closed codereview issue, so archive cannot proceed. Please '
4002 'checkout another branch and run this command again.' %
4003 current_branch)
4004 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004005
4006 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004007 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004008 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004009 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004010 return 1
4011
4012 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004013 if not options.notags:
4014 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004015
4016 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4017 # Clean up the tag if we failed to delete the branch.
4018 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004019
vapiera7fbd5a2016-06-16 09:17:49 -07004020 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004021
4022 return 0
4023
4024
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004025@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004026def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004027 """Show status of changelists.
4028
4029 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004030 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004031 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004032 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004033 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004034 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004035 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004036 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004037
4038 Also see 'git cl comments'.
4039 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004040 parser.add_option(
4041 '--no-branch-color',
4042 action='store_true',
4043 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004044 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004045 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004046 parser.add_option('-f', '--fast', action='store_true',
4047 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004048 parser.add_option(
4049 '-j', '--maxjobs', action='store', type=int,
4050 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004051 parser.add_option(
4052 '-i', '--issue', type=int,
4053 help='Operate on this issue instead of the current branch\'s implicit '
4054 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004055 parser.add_option('-d',
4056 '--date-order',
4057 action='store_true',
4058 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004059 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004060 if args:
4061 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004062
iannuccie53c9352016-08-17 14:40:40 -07004063 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004064 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004067 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004068 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004069 if cl.GetIssue():
4070 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 elif options.field == 'id':
4072 issueid = cl.GetIssue()
4073 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004074 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004076 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004077 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004078 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004079 elif options.field == 'status':
4080 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004081 elif options.field == 'url':
4082 url = cl.GetIssueURL()
4083 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004084 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004085 return 0
4086
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004087 branches = RunGit([
4088 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4089 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004090 if not branches:
4091 print('No local branch found.')
4092 return 0
4093
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004094 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004095 Changelist(branchref=b, commit_date=ct)
4096 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4097 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004099 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004100 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004101 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004102
Edward Lemur85153282020-02-14 22:06:29 +00004103 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004104
4105 def FormatBranchName(branch, colorize=False):
4106 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4107 an asterisk when it is the current branch."""
4108
4109 asterisk = ""
4110 color = Fore.RESET
4111 if branch == current_branch:
4112 asterisk = "* "
4113 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004114 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004115
4116 if colorize:
4117 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004118 return asterisk + branch_name
4119
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004120 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004121
4122 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004123
4124 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004125 sorted_changes = sorted(changes,
4126 key=lambda c: c.GetCommitDate(),
4127 reverse=True)
4128 else:
4129 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4130 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004131 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004132 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004133 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004134 branch_statuses[c.GetBranch()] = status
4135 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004136 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004137 if url and (not status or status == 'error'):
4138 # The issue probably doesn't exist anymore.
4139 url += ' (broken)'
4140
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004141 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004142 # Turn off bold as well as colors.
4143 END = '\033[0m'
4144 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004145 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004146 color = ''
4147 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004148 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004149
Alan Cuttera3be9a52019-03-04 18:50:33 +00004150 branch_display = FormatBranchName(branch)
4151 padding = ' ' * (alignment - len(branch_display))
4152 if not options.no_branch_color:
4153 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004154
Alan Cuttera3be9a52019-03-04 18:50:33 +00004155 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4156 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004157
vapiera7fbd5a2016-06-16 09:17:49 -07004158 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004159 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004160 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004161 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004162 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004163 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004164 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004165 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004167 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004168 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004169 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004170 return 0
4171
4172
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004173def colorize_CMDstatus_doc():
4174 """To be called once in main() to add colors to git cl status help."""
4175 colors = [i for i in dir(Fore) if i[0].isupper()]
4176
4177 def colorize_line(line):
4178 for color in colors:
4179 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004180 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004181 indent = len(line) - len(line.lstrip(' ')) + 1
4182 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4183 return line
4184
4185 lines = CMDstatus.__doc__.splitlines()
4186 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4187
4188
phajdan.jre328cf92016-08-22 04:12:17 -07004189def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004190 if path == '-':
4191 json.dump(contents, sys.stdout)
4192 else:
4193 with open(path, 'w') as f:
4194 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004195
4196
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004197@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004198@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004200 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004201
4202 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004203 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004204 parser.add_option('-r', '--reverse', action='store_true',
4205 help='Lookup the branch(es) for the specified issues. If '
4206 'no issues are specified, all branches with mapped '
4207 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004208 parser.add_option('--json',
4209 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004210 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004211
dnj@chromium.org406c4402015-03-03 17:22:28 +00004212 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004213 branches = RunGit(['for-each-ref', 'refs/heads',
4214 '--format=%(refname)']).splitlines()
4215 # Reverse issue lookup.
4216 issue_branch_map = {}
4217
4218 git_config = {}
4219 for config in RunGit(['config', '--get-regexp',
4220 r'branch\..*issue']).splitlines():
4221 name, _space, val = config.partition(' ')
4222 git_config[name] = val
4223
4224 for branch in branches:
4225 issue = git_config.get(
4226 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4227 if issue:
4228 issue_branch_map.setdefault(int(issue), []).append(branch)
4229 if not args:
4230 args = sorted(issue_branch_map.keys())
4231 result = {}
4232 for issue in args:
4233 try:
4234 issue_num = int(issue)
4235 except ValueError:
4236 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4237 continue
4238 result[issue_num] = issue_branch_map.get(issue_num)
4239 print('Branch for issue number %s: %s' %
4240 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4241 if options.json:
4242 write_json(options.json, result)
4243 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004244
4245 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004246 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004247 if not issue.valid:
4248 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4249 'or no argument to list it.\n'
4250 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004251 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004252 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004253 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004254 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004255 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4256 if options.json:
4257 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004258 'gerrit_host': cl.GetGerritHost(),
4259 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004260 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004261 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004262 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004263 return 0
4264
4265
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004266@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004267def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004268 """Shows or posts review comments for any changelist."""
4269 parser.add_option('-a', '--add-comment', dest='comment',
4270 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004271 parser.add_option('-p', '--publish', action='store_true',
4272 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004273 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004274 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004275 parser.add_option('-m', '--machine-readable', dest='readable',
4276 action='store_false', default=True,
4277 help='output comments in a format compatible with '
4278 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004279 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004280 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004281 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004282
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004283 issue = None
4284 if options.issue:
4285 try:
4286 issue = int(options.issue)
4287 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004288 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004289
Edward Lemur934836a2019-09-09 20:16:54 +00004290 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004291
4292 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004293 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004294 return 0
4295
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004296 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4297 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004298 for comment in summary:
4299 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004301 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004302 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004303 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004304 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004305 elif comment.autogenerated:
4306 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004307 else:
4308 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004309 print('\n%s%s %s%s\n%s' % (
4310 color,
4311 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4312 comment.sender,
4313 Fore.RESET,
4314 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4315
smut@google.comc85ac942015-09-15 16:34:43 +00004316 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004317 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004318 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004319 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4320 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004321 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004322 return 0
4323
4324
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004325@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004326@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004327def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004328 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004329 parser.add_option('-d', '--display', action='store_true',
4330 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004331 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004332 help='New description to set for this issue (- for stdin, '
4333 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004334 parser.add_option('-f', '--force', action='store_true',
4335 help='Delete any unpublished Gerrit edits for this issue '
4336 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004337
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004338 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004339
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004340 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004341 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004342 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004343 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004344 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004345
Edward Lemur934836a2019-09-09 20:16:54 +00004346 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004347 if target_issue_arg:
4348 kwargs['issue'] = target_issue_arg.issue
4349 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004350
4351 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004352 if not cl.GetIssue():
4353 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004354
Edward Lemur678a6842019-10-03 22:25:05 +00004355 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004356 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004357
Edward Lemur6c6827c2020-02-06 21:15:18 +00004358 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004359
smut@google.com34fb6b12015-07-13 20:03:26 +00004360 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004361 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004362 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004363
4364 if options.new_description:
4365 text = options.new_description
4366 if text == '-':
4367 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004368 elif text == '+':
4369 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004370 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004371
4372 description.set_description(text)
4373 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004374 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004375 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004376 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004377 return 0
4378
4379
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004380@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004381def CMDlint(parser, args):
4382 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004383 parser.add_option('--filter', action='append', metavar='-x,+y',
4384 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004385 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004386
4387 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004388 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004389 try:
4390 import cpplint
4391 import cpplint_chromium
4392 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004393 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004394 return 1
4395
4396 # Change the current working directory before calling lint so that it
4397 # shows the correct base.
4398 previous_cwd = os.getcwd()
4399 os.chdir(settings.GetRoot())
4400 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004401 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004402 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004403 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004404 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004405 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004406
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004407 # Process cpplint arguments, if any.
4408 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4409 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004410 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004411
Lei Zhang379d1ad2020-07-15 19:40:06 +00004412 include_regex = re.compile(settings.GetLintRegex())
4413 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004414 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4415 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004416 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004417 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004418 continue
4419
4420 if ignore_regex.match(filename):
4421 print('Ignoring file %s' % filename)
4422 continue
4423
4424 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4425 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004426 finally:
4427 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004428 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004429 if cpplint._cpplint_state.error_count != 0:
4430 return 1
4431 return 0
4432
4433
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004434@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004436 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004437 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004438 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004439 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004440 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004441 parser.add_option('--all', action='store_true',
4442 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004443 parser.add_option('--files',
4444 nargs=1,
4445 help='Semicolon-separated list of files to be marked as '
4446 'modified when executing presubmit or post-upload hooks. '
4447 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004448 parser.add_option('--parallel', action='store_true',
4449 help='Run all tests specified by input_api.RunTests in all '
4450 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004451 parser.add_option('--resultdb', action='store_true',
4452 help='Run presubmit checks in the ResultSink environment '
4453 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004454 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004455 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004456
sbc@chromium.org71437c02015-04-09 19:29:40 +00004457 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004458 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459 return 1
4460
Edward Lemur934836a2019-09-09 20:16:54 +00004461 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462 if args:
4463 base_branch = args[0]
4464 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004465 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004466 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004467
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004468 start = time.time()
4469 try:
4470 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4471 description = cl.FetchDescription()
4472 else:
4473 description = _create_description_from_log([base_branch])
4474 except Exception as e:
4475 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004476 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004477 elapsed = time.time() - start
4478 if elapsed > 5:
4479 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004480
Bruce Dawson13acea32022-05-03 22:13:08 +00004481 if not base_branch:
4482 if not options.force:
4483 print('use --force to check even when not on a branch.')
4484 return 1
4485 base_branch = 'HEAD'
4486
Josip Sokcevic017544d2022-03-31 23:47:53 +00004487 cl.RunHook(committing=not options.upload,
4488 may_prompt=False,
4489 verbose=options.verbose,
4490 parallel=options.parallel,
4491 upstream=base_branch,
4492 description=description,
4493 all_files=options.all,
4494 files=options.files,
4495 resultdb=options.resultdb,
4496 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004497 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004498
4499
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004500def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004501 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004502
4503 Works the same way as
4504 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4505 but can be called on demand on all platforms.
4506
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004507 The basic idea is to generate git hash of a state of the tree, original
4508 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004509 """
4510 lines = []
4511 tree_hash = RunGitSilent(['write-tree'])
4512 lines.append('tree %s' % tree_hash.strip())
4513 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4514 if code == 0:
4515 lines.append('parent %s' % parent.strip())
4516 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4517 lines.append('author %s' % author.strip())
4518 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4519 lines.append('committer %s' % committer.strip())
4520 lines.append('')
4521 # Note: Gerrit's commit-hook actually cleans message of some lines and
4522 # whitespace. This code is not doing this, but it clearly won't decrease
4523 # entropy.
4524 lines.append(message)
4525 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004526 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004527 return 'I%s' % change_hash.strip()
4528
4529
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004530def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004531 """Computes the remote branch ref to use for the CL.
4532
4533 Args:
4534 remote (str): The git remote for the CL.
4535 remote_branch (str): The git remote branch for the CL.
4536 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004537 """
4538 if not (remote and remote_branch):
4539 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004540
wittman@chromium.org455dc922015-01-26 20:15:50 +00004541 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004542 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004543 # refs, which are then translated into the remote full symbolic refs
4544 # below.
4545 if '/' not in target_branch:
4546 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4547 else:
4548 prefix_replacements = (
4549 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4550 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4551 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4552 )
4553 match = None
4554 for regex, replacement in prefix_replacements:
4555 match = re.search(regex, target_branch)
4556 if match:
4557 remote_branch = target_branch.replace(match.group(0), replacement)
4558 break
4559 if not match:
4560 # This is a branch path but not one we recognize; use as-is.
4561 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004562 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004563 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004564 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004565 # Handle the refs that need to land in different refs.
4566 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004567
wittman@chromium.org455dc922015-01-26 20:15:50 +00004568 # Create the true path to the remote branch.
4569 # Does the following translation:
4570 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004571 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004572 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4573 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4574 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4575 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4576 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4577 'refs/heads/')
4578 elif remote_branch.startswith('refs/remotes/branch-heads'):
4579 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004580
wittman@chromium.org455dc922015-01-26 20:15:50 +00004581 return remote_branch
4582
4583
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004584def cleanup_list(l):
4585 """Fixes a list so that comma separated items are put as individual items.
4586
4587 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4588 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4589 """
4590 items = sum((i.split(',') for i in l), [])
4591 stripped_items = (i.strip() for i in items)
4592 return sorted(filter(None, stripped_items))
4593
4594
Aaron Gable4db38df2017-11-03 14:59:07 -07004595@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004596@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004597def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004598 """Uploads the current changelist to codereview.
4599
4600 Can skip dependency patchset uploads for a branch by running:
4601 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004602 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004603 git config --unset branch.branch_name.skip-deps-uploads
4604 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004605
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004606 If the name of the checked out branch starts with "bug-" or "fix-" followed
4607 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004608 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004609
4610 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004611 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004612 [git-cl] add support for hashtags
4613 Foo bar: implement foo
4614 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004615 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004616 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4617 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004618 parser.add_option('--bypass-watchlists', action='store_true',
4619 dest='bypass_watchlists',
4620 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004621 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004622 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004623 parser.add_option('--message', '-m', dest='message',
4624 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004625 parser.add_option('-b', '--bug',
4626 help='pre-populate the bug number(s) for this issue. '
4627 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004628 parser.add_option('--message-file', dest='message_file',
4629 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004630 parser.add_option('--title', '-t', dest='title',
4631 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004632 parser.add_option('-T', '--skip-title', action='store_true',
4633 dest='skip_title',
4634 help='Use the most recent commit message as the title of '
4635 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004636 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004637 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004638 help='reviewer email addresses')
4639 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004640 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004641 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004642 parser.add_option('--hashtag', dest='hashtags',
4643 action='append', default=[],
4644 help=('Gerrit hashtag for new CL; '
4645 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004646 parser.add_option('-s',
4647 '--send-mail',
4648 '--send-email',
4649 dest='send_mail',
4650 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004651 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004652 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004653 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004654 metavar='TARGET',
4655 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004656 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004657 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004658 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004659 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004660 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004661 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004662 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004663 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4664 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004665 parser.add_option('-c',
4666 '--use-commit-queue',
4667 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004668 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004669 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004670 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004671 parser.add_option('-d', '--cq-dry-run',
4672 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004673 help='Send the patchset to do a CQ dry run right after '
4674 'upload.')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004675 parser.add_option('--set-bot-commit', action='store_true',
4676 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004677 parser.add_option('--preserve-tryjobs', action='store_true',
4678 help='instruct the CQ to let tryjobs running even after '
4679 'new patchsets are uploaded instead of canceling '
4680 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004681 parser.add_option('--dependencies', action='store_true',
4682 help='Uploads CLs of all the local branches that depend on '
4683 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004684 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4685 help='Sends your change to the CQ after an approval. Only '
4686 'works on repos that have the Auto-Submit label '
4687 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004688 parser.add_option('--parallel', action='store_true',
4689 help='Run all tests specified by input_api.RunTests in all '
4690 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004691 parser.add_option('--no-autocc', action='store_true',
4692 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004693 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004694 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004695 parser.add_option('-R', '--retry-failed', action='store_true',
4696 help='Retry failed tryjobs from old patchset immediately '
4697 'after uploading new patchset. Cannot be used with '
4698 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004699 parser.add_option('--fixed', '-x',
4700 help='List of bugs that will be commented on and marked '
4701 'fixed (pre-populates "Fixed:" tag). Same format as '
4702 '-b option / "Bug:" tag. If fixing several issues, '
4703 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004704 parser.add_option('--edit-description', action='store_true', default=False,
4705 help='Modify description before upload. Cannot be used '
4706 'with --force. It is a noop when --no-squash is set '
4707 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004708 parser.add_option('--git-completion-helper', action="store_true",
4709 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004710 parser.add_option('-o',
4711 '--push-options',
4712 action='append',
4713 default=[],
4714 help='Transmit the given string to the server when '
4715 'performing git push (pass-through). See git-push '
4716 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004717 parser.add_option('--no-add-changeid',
4718 action='store_true',
4719 dest='no_add_changeid',
4720 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004721 parser.add_option('--cherry-pick-stacked',
4722 '--cp',
4723 dest='cherry_pick_stacked',
4724 action='store_true',
4725 help='If parent branch has un-uploaded updates, '
4726 'automatically skip parent branches and just upload '
4727 'the current branch cherry-pick on its parent\'s last '
4728 'uploaded commit. Allows users to skip the potential '
4729 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004730 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004731
rmistry@google.com2dd99862015-06-22 12:22:18 +00004732 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004733 (options, args) = parser.parse_args(args)
4734
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004735 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004736 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4737 if opt.help != optparse.SUPPRESS_HELP))
4738 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004739
sbc@chromium.org71437c02015-04-09 19:29:40 +00004740 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004741 return 1
4742
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004743 options.reviewers = cleanup_list(options.reviewers)
4744 options.cc = cleanup_list(options.cc)
4745
Josipe827b0f2020-01-30 00:07:20 +00004746 if options.edit_description and options.force:
4747 parser.error('Only one of --force and --edit-description allowed')
4748
tandriib80458a2016-06-23 12:20:07 -07004749 if options.message_file:
4750 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004751 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004752 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004753
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004754 if ([options.cq_dry_run,
4755 options.use_commit_queue,
4756 options.retry_failed].count(True) > 1):
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00004757 parser.error('Only one of --use-commit-queue, --cq-dry-run or '
4758 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004759
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004760 if options.skip_title and options.title:
4761 parser.error('Only one of --title and --skip-title allowed.')
4762
Aaron Gableedbc4132017-09-11 13:22:28 -07004763 if options.use_commit_queue:
4764 options.send_mail = True
4765
Edward Lesmes0dd54822020-03-26 18:24:25 +00004766 if options.squash is None:
4767 # Load default for user, repo, squash=true, in this order.
4768 options.squash = settings.GetSquashGerritUploads()
4769
Joanna Wang5051ffe2023-03-01 22:24:07 +00004770 cl = Changelist(branchref=options.target_branch)
4771
4772 # Warm change details cache now to avoid RPCs later, reducing latency for
4773 # developers.
4774 if cl.GetIssue():
4775 cl._GetChangeDetail(
4776 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4777
4778 if options.retry_failed and not cl.GetIssue():
4779 print('No previous patchsets, so --retry-failed has no effect.')
4780 options.retry_failed = False
4781
Joanna Wang5051ffe2023-03-01 22:24:07 +00004782
Joanna Wang4786a412023-05-16 18:23:08 +00004783 disable_dogfood_stacked_changes = os.environ.get(
4784 DOGFOOD_STACKED_CHANGES_VAR) == '0'
4785 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) == '1'
4786
4787 # Only print message for folks who don't have DOGFOOD_STACKED_CHANGES set
4788 # to an expected value.
4789 if (options.squash and not dogfood_stacked_changes
4790 and not disable_dogfood_stacked_changes):
Joanna Wang1398e4f2023-05-01 18:49:13 +00004791 print(
4792 'This repo has been enrolled in the stacked changes dogfood.\n'
4793 '`git cl upload` now uploads the current branch and all upstream '
4794 'branches that have un-uploaded updates.\n'
4795 'Patches can now be reapplied with --force:\n'
4796 '`git cl patch --reapply --force`.\n'
4797 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
Joanna Wang4786a412023-05-16 18:23:08 +00004798 '\n'
4799 'Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4800 '"Set new changes to "work in progress" by default" checkbox at\n'
4801 'https://<host>-review.googlesource.com/settings/\n'
4802 '\n'
4803 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`.\n'
4804 'To hide this message use `export DOGFOOD_STACKED_CHANGES=1`.\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004805 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004806
Joanna Wang4786a412023-05-16 18:23:08 +00004807 if options.squash and not disable_dogfood_stacked_changes:
Joanna Wangdd12deb2023-01-26 20:43:28 +00004808 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004809 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004810
Joanna Wangd75fc882023-03-01 21:53:34 +00004811 if options.cherry_pick_stacked:
4812 try:
4813 orig_args.remove('--cherry-pick-stacked')
4814 except ValueError:
4815 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004816 UploadAllSquashed(options, orig_args)
4817 return 0
4818
Joanna Wangd75fc882023-03-01 21:53:34 +00004819 if options.cherry_pick_stacked:
4820 parser.error('--cherry-pick-stacked is not available for this workflow.')
4821
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004822 # cl.GetMostRecentPatchset uses cached information, and can return the last
4823 # patchset before upload. Calling it here makes it clear that it's the
4824 # last patchset before upload. Note that GetMostRecentPatchset will fail
4825 # if no CL has been uploaded yet.
4826 if options.retry_failed:
4827 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004828
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004829 ret = cl.CMDUpload(options, args, orig_args)
4830
4831 if options.retry_failed:
4832 if ret != 0:
4833 print('Upload failed, so --retry-failed has no effect.')
4834 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004835 builds, _ = _fetch_latest_builds(cl,
4836 DEFAULT_BUILDBUCKET_HOST,
4837 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004838 jobs = _filter_failed_for_retry(builds)
4839 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004840 print('No failed tryjobs, so --retry-failed has no effect.')
4841 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004842 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004843
4844 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004845
4846
Joanna Wang18de1f62023-01-21 01:24:24 +00004847def UploadAllSquashed(options, orig_args):
4848 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4849 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004850 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004851
Joanna Wangc710e2d2023-01-25 14:53:22 +00004852 # Create commits.
4853 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4854 if cherry_pick_current:
4855 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4856 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4857 uploads_by_cl.append((cls[0], new_upload))
4858 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004859 ordered_cls = list(reversed(cls))
4860
Joanna Wang6215dd02023-02-07 15:58:03 +00004861 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004862 # We can only support external changes when we're only uploading one
4863 # branch.
4864 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004865 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004866 if parent is None:
4867 origin = '.'
4868 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004869
Joanna Wang7603f042023-03-01 22:17:36 +00004870 while origin == '.':
4871 # Search for cl's closest ancestor with a gerrit hash.
4872 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4873 if origin == '.':
4874 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4875
4876 # Support the `git merge` and `git pull` workflow.
4877 if upstream_branch in ['master', 'main']:
4878 parent = cl.GetCommonAncestorWithUpstream()
4879 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004880 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4881 upstream_branch,
4882 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004883 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4884 upstream_branch,
4885 GERRIT_SQUASH_HASH_CONFIG_KEY)
4886 if parent:
4887 break
4888 branch = upstream_branch
4889 else:
4890 # Either the root of the tree is the cl's direct parent and the while
4891 # loop above only found empty branches between cl and the root of the
4892 # tree.
4893 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004894
Joanna Wang05b60342023-03-29 20:25:57 +00004895 if orig_parent is None:
4896 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004897 for i, cl in enumerate(ordered_cls):
4898 # If we're in the middle of the stack, set end_commit to downstream's
4899 # direct ancestor.
4900 if i + 1 < len(ordered_cls):
4901 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4902 else:
4903 child_base_commit = None
4904 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004905 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004906 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004907 end_commit=child_base_commit)
4908 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004909 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004910 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004911
4912 # Create refspec options
4913 cl, new_upload = uploads_by_cl[-1]
4914 refspec_opts = cl._GetRefSpecOptions(
4915 options,
4916 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004917 multi_change_upload=len(uploads_by_cl) > 1,
4918 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004919 refspec_suffix = ''
4920 if refspec_opts:
4921 refspec_suffix = '%' + ','.join(refspec_opts)
4922 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4923 refspec_suffix)
4924
4925 remote, remote_branch = cl.GetRemoteBranch()
4926 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4927 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4928 refspec_suffix)
4929
4930 # Git push
4931 git_push_metadata = {
4932 'gerrit_host':
4933 cl.GetGerritHost(),
4934 'title':
4935 options.title or '<untitled>',
4936 'change_id':
4937 git_footers.get_footer_change_id(new_upload.change_desc.description),
4938 'description':
4939 new_upload.change_desc.description,
4940 }
4941 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004942 git_push_metadata,
4943 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004944
4945 # Post push updates
4946 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4947 change_numbers = [
4948 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4949 ]
4950
4951 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4952 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4953
4954 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004955
4956
4957def _UploadAllPrecheck(options, orig_args):
4958 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4959 """Checks the state of the tree and gives the user uploading options
4960
4961 Returns: A tuple of the ordered list of changes that have new commits
4962 since their last upload and a boolean of whether the user wants to
4963 cherry-pick and upload the current branch instead of uploading all cls.
4964 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004965 cl = Changelist()
4966 if cl.GetBranch() is None:
4967 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4968
Joanna Wang18de1f62023-01-21 01:24:24 +00004969 branch_ref = None
4970 cls = []
4971 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004972 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004973
4974 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4975
4976 while True:
4977 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4978 DieWithError(
4979 'More than %s branches in the stack have not been uploaded.\n'
4980 'Are your branches in a misconfigured state?\n'
4981 'If not, please upload some upstream changes first.' %
4982 (_MAX_STACKED_BRANCHES_UPLOAD))
4983
4984 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004985
Joanna Wang6215dd02023-02-07 15:58:03 +00004986 # Only add CL if it has anything to commit.
4987 base_commit = cl.GetCommonAncestorWithUpstream()
4988 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4989
4990 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4991 if diff:
4992 cls.append(cl)
4993 if (not first_pass and
4994 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4995 # We are mid-stack and the user must upload their upstream branches.
4996 must_upload_upstream = True
4997 elif first_pass: # The current branch has nothing to commit. Exit.
4998 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4999 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5000 first_pass = False
5001
5002 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005003 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005004 branch_ref = upstream_branch_ref # set branch for next run.
5005
Joanna Wang6215dd02023-02-07 15:58:03 +00005006 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5007 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5008 upstream_branch,
5009 LAST_UPLOAD_HASH_CONFIG_KEY)
5010
Joanna Wang18de1f62023-01-21 01:24:24 +00005011 # Case 1: We've reached the beginning of the tree.
5012 if origin != '.':
5013 break
5014
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005016 # the user MUST upload them unless they are empty. Continue to
5017 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005018 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005019 continue
5020
Joanna Wang18de1f62023-01-21 01:24:24 +00005021 # Case 3: If upstream's last_upload == cl.base_commit we do
5022 # not need to upload any more upstreams from this point on.
5023 # (Even if there may be diverged branches higher up the tree)
5024 if base_commit == upstream_last_upload:
5025 break
5026
5027 # Case 4: If upstream's last_upload < cl.base_commit we are
5028 # uploading cl and upstream_cl.
5029 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005030 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005031 continue
5032
5033 # Case 5: If cl.base_commit < upstream's last_upload the user
5034 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005035 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005036 DieWithError(
5037 'At least one branch in the stack has diverged from its upstream '
5038 'branch and does not contain its upstream\'s last upload.\n'
5039 'Please rebase the stack with `git rebase-update` before uploading.')
5040
5041 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5042 # any relation to commits in the tree. Continue up the tree until we hit
5043 # the root.
5044
5045 # We assume all cls in the stack have the same auth requirements and only
5046 # check this once.
5047 cls[0].EnsureAuthenticated(force=options.force)
5048
5049 cherry_pick = False
5050 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005051 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005052 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005053 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005054 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005055 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005056 msg = ('At least one parent branch in `%s` has never been uploaded '
5057 'and must be uploaded before/with `%s`.\n' %
5058 (branches, cls[1].branch))
5059 if options.cherry_pick_stacked:
5060 DieWithError(msg)
5061 if not options.force:
5062 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005063 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005064 if options.cherry_pick_stacked:
5065 print('cherry-picking `%s` on %s\'s last upload' %
5066 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005067 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005068 elif not options.force:
5069 answer = gclient_utils.AskForData(
5070 '\n' + opt_message +
5071 'Press enter to update branches %s.\nOr type `n` to upload only '
5072 '`%s` cherry-picked on %s\'s last upload:' %
5073 (branches, cls[0].branch, cls[1].branch))
5074 if answer.lower() == 'n':
5075 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005076 return cls, cherry_pick
5077
5078
Francois Dorayd42c6812017-05-30 15:10:20 -04005079@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005080@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005081def CMDsplit(parser, args):
5082 """Splits a branch into smaller branches and uploads CLs.
5083
5084 Creates a branch and uploads a CL for each group of files modified in the
5085 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005086 comment, the string '$directory', is replaced with the directory containing
5087 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005088 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005089 parser.add_option('-d', '--description', dest='description_file',
5090 help='A text file containing a CL description in which '
5091 '$directory will be replaced by each CL\'s directory.')
5092 parser.add_option('-c', '--comment', dest='comment_file',
5093 help='A text file containing a CL comment.')
5094 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005095 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005096 help='List the files and reviewers for each CL that would '
5097 'be created, but don\'t create branches or CLs.')
5098 parser.add_option('--cq-dry-run', action='store_true',
5099 help='If set, will do a cq dry run for each uploaded CL. '
5100 'Please be careful when doing this; more than ~10 CLs '
5101 'has the potential to overload our build '
5102 'infrastructure. Try to upload these not during high '
5103 'load times (usually 11-3 Mountain View time). Email '
5104 'infra-dev@chromium.org with any questions.')
Anne Redulla072d06e2023-07-06 23:12:16 +00005105 parser.add_option('-a',
5106 '--enable-auto-submit',
5107 action='store_true',
5108 dest='enable_auto_submit',
Takuto Ikuta51eca592019-02-14 19:40:52 +00005109 default=True,
5110 help='Sends your change to the CQ after an approval. Only '
Anne Redulla072d06e2023-07-06 23:12:16 +00005111 'works on repos that have the Auto-Submit label '
5112 'enabled')
5113 parser.add_option('--disable-auto-submit',
5114 action='store_false',
5115 dest='enable_auto_submit',
5116 help='Disables automatic sending of the changes to the CQ '
5117 'after approval. Note that auto-submit only works for '
5118 'repos that have the Auto-Submit label enabled.')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005119 parser.add_option('--max-depth',
5120 type='int',
5121 default=0,
5122 help='The max depth to look for OWNERS files. Useful for '
5123 'controlling the granularity of the split CLs, e.g. '
5124 '--max-depth=1 will only split by top-level '
5125 'directory. Specifying a value less than 1 means no '
5126 'limit on max depth.')
Rachael Newitt03e49122023-06-28 21:39:21 +00005127 parser.add_option('--topic',
5128 default=None,
5129 help='Topic to specify when uploading')
Francois Dorayd42c6812017-05-30 15:10:20 -04005130 options, _ = parser.parse_args(args)
5131
5132 if not options.description_file:
5133 parser.error('No --description flag specified.')
5134
5135 def WrappedCMDupload(args):
5136 return CMDupload(OptionParser(), args)
5137
Daniel Cheng403c44e2022-10-05 22:24:58 +00005138 return split_cl.SplitCl(options.description_file, options.comment_file,
5139 Changelist, WrappedCMDupload, options.dry_run,
5140 options.cq_dry_run, options.enable_auto_submit,
Rachael Newitt03e49122023-06-28 21:39:21 +00005141 options.max_depth, options.topic, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005142
5143
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005144@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005145@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005146def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005147 """DEPRECATED: Used to commit the current changelist via git-svn."""
5148 message = ('git-cl no longer supports committing to SVN repositories via '
5149 'git-svn. You probably want to use `git cl land` instead.')
5150 print(message)
5151 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005152
5153
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005154@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005155@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005156def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005157 """Commits the current changelist via git.
5158
5159 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5160 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005161 """
5162 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5163 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005164 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005165 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005166 parser.add_option('--parallel', action='store_true',
5167 help='Run all tests specified by input_api.RunTests in all '
5168 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005169 parser.add_option('--resultdb', action='store_true',
5170 help='Run presubmit checks in the ResultSink environment '
5171 'and send results to the ResultDB database.')
5172 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005174
Edward Lemur934836a2019-09-09 20:16:54 +00005175 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005176
Robert Iannucci2e73d432018-03-14 01:10:47 -07005177 if not cl.GetIssue():
5178 DieWithError('You must upload the change first to Gerrit.\n'
5179 ' If you would rather have `git cl land` upload '
5180 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005181 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5182 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005183
5184
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005185@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005186@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005187def CMDpatch(parser, args):
Victor Hugo Vianna Silvadeff9a22023-07-11 18:07:18 +00005188 """Applies (cherry-picks) a Gerrit changelist locally."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005189 parser.add_option('-b', dest='newbranch',
5190 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005191 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005192 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005193 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005194 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005195
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005196 group = optparse.OptionGroup(
5197 parser,
5198 'Options for continuing work on the current issue uploaded from a '
5199 'different clone (e.g. different machine). Must be used independently '
5200 'from the other options. No issue number should be specified, and the '
5201 'branch must have an issue number associated with it')
5202 group.add_option('--reapply', action='store_true', dest='reapply',
5203 help='Reset the branch and reapply the issue.\n'
5204 'CAUTION: This will undo any local changes in this '
5205 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005206
5207 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005208 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005209 parser.add_option_group(group)
5210
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005211 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005212
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005213 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005214 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005215 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005216 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005217 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005218
Edward Lemur934836a2019-09-09 20:16:54 +00005219 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005220 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005221 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005222
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005223 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005224 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005225 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005226
5227 RunGit(['reset', '--hard', upstream])
5228 if options.pull:
5229 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005230
Edward Lemur678a6842019-10-03 22:25:05 +00005231 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005232 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5233 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005234
5235 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005236 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005237
Edward Lemurf38bc172019-09-03 21:02:13 +00005238 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005239 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005240 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005241
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005242 # We don't want uncommitted changes mixed up with the patch.
5243 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005244 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005245
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005246 if options.newbranch:
5247 if options.force:
5248 RunGit(['branch', '-D', options.newbranch],
5249 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005250 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005251
Edward Lemur678a6842019-10-03 22:25:05 +00005252 cl = Changelist(
5253 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005254
Edward Lemur678a6842019-10-03 22:25:05 +00005255 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005256 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005257
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005258 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5259 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005260
5261
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005262def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263 """Fetches the tree status and returns either 'open', 'closed',
5264 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005265 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005267 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005268 if status.find('closed') != -1 or status == '0':
5269 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005270
5271 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005272 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005273
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005275 return 'unset'
5276
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005277
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005278def GetTreeStatusReason():
5279 """Fetches the tree status from a json url and returns the message
5280 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005281 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005282 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005283 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 status = json.loads(connection.read())
5285 connection.close()
5286 return status['message']
5287
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005288
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005289@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005290def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005291 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005292 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005293 status = GetTreeStatus()
5294 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005295 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005296 return 2
5297
vapiera7fbd5a2016-06-16 09:17:49 -07005298 print('The tree is %s' % status)
5299 print()
5300 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005301 if status != 'open':
5302 return 1
5303 return 0
5304
5305
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005306@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005307def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005308 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5309 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005310 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005311 '-b', '--bot', action='append',
5312 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5313 'times to specify multiple builders. ex: '
5314 '"-b win_rel -b win_layout". See '
5315 'the try server waterfall for the builders name and the tests '
5316 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005317 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005318 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005319 help=('Buildbucket bucket to send the try requests. Format: '
5320 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005321 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005322 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005323 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005324 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005325 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005326 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005327 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005328 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005329 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005330 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005331 '--category', default='git_cl_try', help='Specify custom build category.')
5332 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005333 '--project',
5334 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005335 'in recipe to determine to which repository or directory to '
5336 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005338 '-p', '--property', dest='properties', action='append', default=[],
5339 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005340 'key2=value2 etc. The value will be treated as '
5341 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005342 'NOTE: using this may make your tryjob not usable for CQ, '
5343 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005344 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005345 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5346 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005347 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005348 parser.add_option(
5349 '-R', '--retry-failed', action='store_true', default=False,
5350 help='Retry failed jobs from the latest set of tryjobs. '
5351 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005352 parser.add_option(
5353 '-i', '--issue', type=int,
5354 help='Operate on this issue instead of the current branch\'s implicit '
5355 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005356 options, args = parser.parse_args(args)
5357
machenbach@chromium.org45453142015-09-15 08:45:22 +00005358 # Make sure that all properties are prop=value pairs.
5359 bad_params = [x for x in options.properties if '=' not in x]
5360 if bad_params:
5361 parser.error('Got properties with missing "=": %s' % bad_params)
5362
maruel@chromium.org15192402012-09-06 12:38:29 +00005363 if args:
5364 parser.error('Unknown arguments: %s' % args)
5365
Edward Lemur934836a2019-09-09 20:16:54 +00005366 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005367 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005368 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005369
Edward Lemurf38bc172019-09-03 21:02:13 +00005370 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005371 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005372
tandriie113dfd2016-10-11 10:20:12 -07005373 error_message = cl.CannotTriggerTryJobReason()
5374 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005375 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005376
Edward Lemur45768512020-03-02 19:03:14 +00005377 if options.bot:
5378 if options.retry_failed:
5379 parser.error('--bot is not compatible with --retry-failed.')
5380 if not options.bucket:
5381 parser.error('A bucket (e.g. "chromium/try") is required.')
5382
5383 triggered = [b for b in options.bot if 'triggered' in b]
5384 if triggered:
5385 parser.error(
5386 'Cannot schedule builds on triggered bots: %s.\n'
5387 'This type of bot requires an initial job from a parent (usually a '
5388 'builder). Schedule a job on the parent instead.\n' % triggered)
5389
5390 if options.bucket.startswith('.master'):
5391 parser.error('Buildbot masters are not supported.')
5392
5393 project, bucket = _parse_bucket(options.bucket)
5394 if project is None or bucket is None:
5395 parser.error('Invalid bucket: %s.' % options.bucket)
5396 jobs = sorted((project, bucket, bot) for bot in options.bot)
5397 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005398 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005399 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005400 if options.verbose:
5401 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005402 jobs = _filter_failed_for_retry(builds)
5403 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005404 print('There are no failed jobs in the latest set of jobs '
5405 '(patchset #%d), doing nothing.' % patchset)
5406 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005407 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005408 if num_builders > 10:
5409 confirm_or_exit('There are %d builders with failed builds.'
5410 % num_builders, action='continue')
5411 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005412 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005413 print('git cl try with no bots now defaults to CQ dry run.')
5414 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5415 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005416
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005417 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005418 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005419 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005420 except BuildbucketResponseException as ex:
5421 print('ERROR: %s' % ex)
5422 return 1
5423 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005424
5425
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005426@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005427def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005428 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005429 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005430 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005431 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005432 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005433 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005434 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005435 '--color', action='store_true', default=setup_color.IS_TTY,
5436 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005437 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005438 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5439 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005440 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005441 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005442 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005443 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005444 parser.add_option(
5445 '-i', '--issue', type=int,
5446 help='Operate on this issue instead of the current branch\'s implicit '
5447 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005448 options, args = parser.parse_args(args)
5449 if args:
5450 parser.error('Unrecognized args: %s' % ' '.join(args))
5451
Edward Lemur934836a2019-09-09 20:16:54 +00005452 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005453 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005454 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005455
tandrii221ab252016-10-06 08:12:04 -07005456 patchset = options.patchset
5457 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005458 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005459 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005460 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005461 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005462 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005463 cl.GetIssue())
5464
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005465 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005466 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005467 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005468 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005469 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005470 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005471 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005472 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005473 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005474 return 0
5475
5476
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005477@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005478@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005479def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005480 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005481 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005482 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005483 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005484
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005485 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005486 if args:
5487 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005488 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005489 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005490 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005491 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005492
5493 # Clear configured merge-base, if there is one.
5494 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005495 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005496 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005497 return 0
5498
5499
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005500@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005501def CMDweb(parser, args):
5502 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005503 parser.add_option('-p',
5504 '--print-only',
5505 action='store_true',
5506 dest='print_only',
5507 help='Only print the Gerrit URL, don\'t open it in the '
5508 'browser.')
5509 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005510 if args:
5511 parser.error('Unrecognized args: %s' % ' '.join(args))
5512
5513 issue_url = Changelist().GetIssueURL()
5514 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005515 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005516 return 1
5517
Orr Bernstein0b960582022-12-22 20:16:18 +00005518 if options.print_only:
5519 print(issue_url)
5520 return 0
5521
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005522 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005523 # allows us to hide the "Created new window in existing browser session."
5524 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005525 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005526 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005527 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005528 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005529 os.open(os.devnull, os.O_RDWR)
5530 try:
5531 webbrowser.open(issue_url)
5532 finally:
5533 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005534 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005535 return 0
5536
5537
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005538@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005539def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005540 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005541 parser.add_option('-d', '--dry-run', action='store_true',
5542 help='trigger in dry run mode')
5543 parser.add_option('-c', '--clear', action='store_true',
5544 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005545 parser.add_option(
5546 '-i', '--issue', type=int,
5547 help='Operate on this issue instead of the current branch\'s implicit '
5548 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005549 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005550 if args:
5551 parser.error('Unrecognized args: %s' % ' '.join(args))
Struan Shrimpton8b2072b2023-07-31 21:01:26 +00005552 if [options.dry_run, options.clear].count(True) > 1:
5553 parser.error('Only one of --dry-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005554
Edward Lemur934836a2019-09-09 20:16:54 +00005555 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005556 if not cl.GetIssue():
5557 parser.error('Must upload the issue first.')
5558
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005559 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005560 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005561 elif options.dry_run:
5562 state = _CQState.DRY_RUN
5563 else:
5564 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005565 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005566 return 0
5567
5568
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005569@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005570def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005571 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005572 parser.add_option(
5573 '-i', '--issue', type=int,
5574 help='Operate on this issue instead of the current branch\'s implicit '
5575 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005576 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005577 if args:
5578 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005579 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005580 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005581 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005582 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005583 cl.CloseIssue()
5584 return 0
5585
5586
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005587@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005588def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005589 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005590 parser.add_option(
5591 '--stat',
5592 action='store_true',
5593 dest='stat',
5594 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005595 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005596 if args:
5597 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005598
Edward Lemur934836a2019-09-09 20:16:54 +00005599 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005600 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005601 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005602 if not issue:
5603 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005604
Gavin Makbe2e9262022-11-08 23:41:55 +00005605 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005606 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005607 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005608 if not base:
5609 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5610 revision_info = detail['revisions'][detail['current_revision']]
5611 fetch_info = revision_info['fetch']['http']
5612 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5613 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005614
Aaron Gablea718c3e2017-08-28 17:47:28 -07005615 cmd = ['git', 'diff']
5616 if options.stat:
5617 cmd.append('--stat')
5618 cmd.append(base)
5619 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005620
5621 return 0
5622
5623
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005624@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005625def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005626 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005627 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005628 '--ignore-current',
5629 action='store_true',
5630 help='Ignore the CL\'s current reviewers and start from scratch.')
5631 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005632 '--ignore-self',
5633 action='store_true',
5634 help='Do not consider CL\'s author as an owners.')
5635 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005636 '--no-color',
5637 action='store_true',
5638 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005639 parser.add_option(
5640 '--batch',
5641 action='store_true',
5642 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005643 # TODO: Consider moving this to another command, since other
5644 # git-cl owners commands deal with owners for a given CL.
5645 parser.add_option(
5646 '--show-all',
5647 action='store_true',
5648 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005649 options, args = parser.parse_args(args)
5650
Edward Lemur934836a2019-09-09 20:16:54 +00005651 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005652 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005653
Yang Guo6e269a02019-06-26 11:17:02 +00005654 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005655 if len(args) == 0:
5656 print('No files specified for --show-all. Nothing to do.')
5657 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005658 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005659 for path in args:
5660 print('Owners for %s:' % path)
5661 print('\n'.join(
5662 ' - %s' % owner
5663 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005664 return 0
5665
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005666 if args:
5667 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005668 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005669 base_branch = args[0]
5670 else:
5671 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005672 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005673
Edward Lemur2c62b332020-03-12 22:12:33 +00005674 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005675
5676 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005677 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5678 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005679 return 0
5680
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005681 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005682 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005683 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005684 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005685 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005686 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005687 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005688
5689
Aiden Bennerc08566e2018-10-03 17:52:42 +00005690def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005691 """Generates a diff command."""
5692 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005693 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5694
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005695 if allow_prefix:
5696 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5697 # case that diff.noprefix is set in the user's git config.
5698 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5699 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005700 diff_cmd += ['--no-prefix']
5701
5702 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005703
5704 if args:
5705 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005706 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005707 diff_cmd.append(arg)
5708 else:
5709 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005710
5711 return diff_cmd
5712
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005713
Jamie Madill5e96ad12020-01-13 16:08:35 +00005714def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5715 """Runs clang-format-diff and sets a return value if necessary."""
5716
5717 if not clang_diff_files:
5718 return 0
5719
5720 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5721 # formatted. This is used to block during the presubmit.
5722 return_value = 0
5723
5724 # Locate the clang-format binary in the checkout
5725 try:
5726 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5727 except clang_format.NotFoundError as e:
5728 DieWithError(e)
5729
5730 if opts.full or settings.GetFormatFullByDefault():
5731 cmd = [clang_format_tool]
5732 if not opts.dry_run and not opts.diff:
5733 cmd.append('-i')
5734 if opts.dry_run:
5735 for diff_file in clang_diff_files:
5736 with open(diff_file, 'r') as myfile:
5737 code = myfile.read().replace('\r\n', '\n')
5738 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5739 stdout = stdout.replace('\r\n', '\n')
5740 if opts.diff:
5741 sys.stdout.write(stdout)
5742 if code != stdout:
5743 return_value = 2
5744 else:
5745 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5746 if opts.diff:
5747 sys.stdout.write(stdout)
5748 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005749 try:
5750 script = clang_format.FindClangFormatScriptInChromiumTree(
5751 'clang-format-diff.py')
5752 except clang_format.NotFoundError as e:
5753 DieWithError(e)
5754
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005755 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005756 if not opts.dry_run and not opts.diff:
5757 cmd.append('-i')
5758
5759 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005760 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005761
Edward Lesmes89624cd2020-04-06 17:51:56 +00005762 env = os.environ.copy()
5763 env['PATH'] = (
5764 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5765 stdout = RunCommand(
5766 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005767 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005768 if opts.diff:
5769 sys.stdout.write(stdout)
5770 if opts.dry_run and len(stdout) > 0:
5771 return_value = 2
5772
5773 return return_value
5774
5775
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005776def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5777 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5778 presubmit checks have failed (and returns 0 otherwise)."""
5779
5780 if not rust_diff_files:
5781 return 0
5782
5783 # Locate the rustfmt binary.
5784 try:
5785 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5786 except rustfmt.NotFoundError as e:
5787 DieWithError(e)
5788
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005789 # TODO(crbug.com/1440869): Support formatting only the changed lines
5790 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005791 cmd = [rustfmt_tool]
5792 if opts.dry_run:
5793 cmd.append('--check')
5794 cmd += rust_diff_files
5795 rustfmt_exitcode = subprocess2.call(cmd)
5796
5797 if opts.presubmit and rustfmt_exitcode != 0:
5798 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005799
5800 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005801
5802
Olivier Robin0a6b5442022-04-07 07:25:04 +00005803def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5804 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5805 that presubmit checks have failed (and returns 0 otherwise)."""
5806
5807 if not swift_diff_files:
5808 return 0
5809
5810 # Locate the swift-format binary.
5811 try:
5812 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5813 except swift_format.NotFoundError as e:
5814 DieWithError(e)
5815
5816 cmd = [swift_format_tool]
5817 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005818 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005819 else:
5820 cmd += ['format', '-i']
5821 cmd += swift_diff_files
5822 swift_format_exitcode = subprocess2.call(cmd)
5823
5824 if opts.presubmit and swift_format_exitcode != 0:
5825 return 2
5826
5827 return 0
5828
5829
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005830def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005831 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005832 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005833
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005834
enne@chromium.org555cfe42014-01-29 18:21:39 +00005835@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005836@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005837def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005838 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005839 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005840 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005841 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005842 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005843 parser.add_option('--full', action='store_true',
5844 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005845 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005846 parser.add_option('--dry-run', action='store_true',
5847 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005848 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005849 '--no-clang-format',
5850 dest='clang_format',
5851 action='store_false',
5852 default=True,
5853 help='Disables formatting of various file types using clang-format.')
5854 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005855 '--python',
5856 action='store_true',
5857 default=None,
5858 help='Enables python formatting on all python files.')
5859 parser.add_option(
5860 '--no-python',
5861 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005862 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005863 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005864 'If neither --python or --no-python are set, python files that have a '
5865 '.style.yapf file in an ancestor directory will be formatted. '
5866 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005867 parser.add_option(
5868 '--js',
5869 action='store_true',
5870 help='Format javascript code with clang-format. '
5871 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005872 parser.add_option('--diff', action='store_true',
5873 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005874 parser.add_option('--presubmit', action='store_true',
5875 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005876
5877 parser.add_option('--rust-fmt',
5878 dest='use_rust_fmt',
5879 action='store_true',
5880 default=rustfmt.IsRustfmtSupported(),
5881 help='Enables formatting of Rust file types using rustfmt.')
5882 parser.add_option(
5883 '--no-rust-fmt',
5884 dest='use_rust_fmt',
5885 action='store_false',
5886 help='Disables formatting of Rust file types using rustfmt.')
5887
Olivier Robin0a6b5442022-04-07 07:25:04 +00005888 parser.add_option(
5889 '--swift-format',
5890 dest='use_swift_format',
5891 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005892 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005893 help='Enables formatting of Swift file types using swift-format '
5894 '(macOS host only).')
5895 parser.add_option(
5896 '--no-swift-format',
5897 dest='use_swift_format',
5898 action='store_false',
5899 help='Disables formatting of Swift file types using swift-format.')
5900
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005901 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005902
Garrett Beaty91a6f332020-01-06 16:57:24 +00005903 if opts.python is not None and opts.no_python:
5904 raise parser.error('Cannot set both --python and --no-python')
5905 if opts.no_python:
5906 opts.python = False
5907
Daniel Chengc55eecf2016-12-30 03:11:02 -08005908 # Normalize any remaining args against the current path, so paths relative to
5909 # the current directory are still resolved as expected.
5910 args = [os.path.join(os.getcwd(), arg) for arg in args]
5911
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005912 # git diff generates paths against the root of the repository. Change
5913 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005914 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005915 if rel_base_path:
5916 os.chdir(rel_base_path)
5917
digit@chromium.org29e47272013-05-17 17:01:46 +00005918 # Grab the merge-base commit, i.e. the upstream commit of the current
5919 # branch when it was created or the last time it was rebased. This is
5920 # to cover the case where the user may have called "git fetch origin",
5921 # moving the origin branch to a newer commit, but hasn't rebased yet.
5922 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005923 upstream_branch = opts.upstream
5924 if not upstream_branch:
5925 cl = Changelist()
5926 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005927 if upstream_branch:
5928 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5929 upstream_commit = upstream_commit.strip()
5930
5931 if not upstream_commit:
5932 DieWithError('Could not find base commit for this branch. '
5933 'Are you in detached state?')
5934
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005935 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5936 diff_output = RunGit(changed_files_cmd)
5937 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005938 # Filter out files deleted by this CL
5939 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005940
Andreas Haas417d89c2020-02-06 10:24:27 +00005941 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005942 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005943
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005944 clang_diff_files = []
5945 if opts.clang_format:
5946 clang_diff_files = [
5947 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5948 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005949 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005950 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005951 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005952 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005953
Edward Lesmes50da7702020-03-30 19:23:43 +00005954 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005955
Jamie Madill5e96ad12020-01-13 16:08:35 +00005956 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5957 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005958
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005959 if opts.use_rust_fmt:
5960 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5961 upstream_commit)
5962 if rust_fmt_return_value == 2:
5963 return_value = 2
5964
Olivier Robin0a6b5442022-04-07 07:25:04 +00005965 if opts.use_swift_format:
5966 if sys.platform != 'darwin':
5967 DieWithError('swift-format is only supported on macOS.')
5968 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5969 upstream_commit)
5970 if swift_format_return_value == 2:
5971 return_value = 2
5972
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005973 # Similar code to above, but using yapf on .py files rather than clang-format
5974 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005975 py_explicitly_disabled = opts.python is not None and not opts.python
5976 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005977 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5978 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005979
Aiden Bennerc08566e2018-10-03 17:52:42 +00005980 # Used for caching.
5981 yapf_configs = {}
5982 for f in python_diff_files:
5983 # Find the yapf style config for the current file, defaults to depot
5984 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005985 _FindYapfConfigFile(f, yapf_configs, top_dir)
5986
5987 # Turn on python formatting by default if a yapf config is specified.
5988 # This breaks in the case of this repo though since the specified
5989 # style file is also the global default.
5990 if opts.python is None:
5991 filtered_py_files = []
5992 for f in python_diff_files:
5993 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5994 filtered_py_files.append(f)
5995 else:
5996 filtered_py_files = python_diff_files
5997
5998 # Note: yapf still seems to fix indentation of the entire file
5999 # even if line ranges are specified.
6000 # See https://github.com/google/yapf/issues/499
6001 if not opts.full and filtered_py_files:
6002 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6003
Brian Sheedyb4307d52019-12-02 19:18:17 +00006004 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6005 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6006 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006007
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006008 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006009 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6010 # Default to pep8 if not .style.yapf is found.
6011 if not yapf_style:
6012 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006013
Peter Wend9399922020-06-17 17:33:49 +00006014 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006015 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006016 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006017 else:
6018 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006019
6020 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006021
6022 has_formattable_lines = False
6023 if not opts.full:
6024 # Only run yapf over changed line ranges.
6025 for diff_start, diff_len in py_line_diffs[f]:
6026 diff_end = diff_start + diff_len - 1
6027 # Yapf errors out if diff_end < diff_start but this
6028 # is a valid line range diff for a removal.
6029 if diff_end >= diff_start:
6030 has_formattable_lines = True
6031 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6032 # If all line diffs were removals we have nothing to format.
6033 if not has_formattable_lines:
6034 continue
6035
6036 if opts.diff or opts.dry_run:
6037 cmd += ['--diff']
6038 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006039 stdout = RunCommand(cmd,
6040 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006041 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006042 cwd=top_dir,
6043 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006044 if opts.diff:
6045 sys.stdout.write(stdout)
6046 elif len(stdout) > 0:
6047 return_value = 2
6048 else:
6049 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006050 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006051
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006052 # Format GN build files. Always run on full build files for canonical form.
6053 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006054 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006055 if opts.dry_run or opts.diff:
6056 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006057 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006058 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006059 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006060 cwd=top_dir)
6061 if opts.dry_run and gn_ret == 2:
6062 return_value = 2 # Not formatted.
6063 elif opts.diff and gn_ret == 2:
6064 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006065 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006066 elif gn_ret != 0:
6067 # For non-dry run cases (and non-2 return values for dry-run), a
6068 # nonzero error code indicates a failure, probably because the file
6069 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006070 DieWithError('gn format failed on ' + gn_diff_file +
6071 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006072
Ilya Shermane081cbe2017-08-15 17:51:04 -07006073 # Skip the metrics formatting from the global presubmit hook. These files have
6074 # a separate presubmit hook that issues an error if the files need formatting,
6075 # whereas the top-level presubmit script merely issues a warning. Formatting
6076 # these files is somewhat slow, so it's important not to duplicate the work.
6077 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006078 for diff_xml in GetDiffXMLs(diff_files):
6079 xml_dir = GetMetricsDir(diff_xml)
6080 if not xml_dir:
6081 continue
6082
Ilya Shermane081cbe2017-08-15 17:51:04 -07006083 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006084 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006085 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006086
6087 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6088 # command as histograms/pretty_print.py now needs a relative path argument
6089 # after splitting the histograms into multiple directories.
6090 # For example, in tools/metrics/ukm, pretty-print could be run using:
6091 # $ python pretty_print.py
6092 # But in tools/metrics/histogrmas, pretty-print should be run with an
6093 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006094 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006095 # $ python pretty_print.py enums.xml
6096
Weilun Shib92c4b72020-08-27 17:45:11 +00006097 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006098 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006099 cmd.append(diff_xml)
6100
Ilya Shermane081cbe2017-08-15 17:51:04 -07006101 if opts.dry_run or opts.diff:
6102 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006103
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006104 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6105 # `shell` param and instead replace `'vpython'` with
6106 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006107 stdout = RunCommand(cmd,
6108 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006109 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006110 if opts.diff:
6111 sys.stdout.write(stdout)
6112 if opts.dry_run and stdout:
6113 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006114
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006115 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006116
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006117
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006118def GetDiffXMLs(diff_files):
6119 return [
6120 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6121 ]
6122
6123
6124def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006125 metrics_xml_dirs = [
6126 os.path.join('tools', 'metrics', 'actions'),
6127 os.path.join('tools', 'metrics', 'histograms'),
6128 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006129 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006130 os.path.join('tools', 'metrics', 'ukm'),
6131 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006132 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006133 if diff_xml.startswith(xml_dir):
6134 return xml_dir
6135 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006136
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006137
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006138@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006139@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006140def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006141 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006142 _, args = parser.parse_args(args)
6143
6144 if len(args) != 1:
6145 parser.print_help()
6146 return 1
6147
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006148 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006149 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006150 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006151
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006152 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006153
Edward Lemur52969c92020-02-06 18:15:28 +00006154 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006155 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006156 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006157
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006158 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006159 for key, issue in [x.split() for x in output.splitlines()]:
6160 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006161 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006162
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006163 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006164 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006165 return 1
6166 if len(branches) == 1:
6167 RunGit(['checkout', branches[0]])
6168 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006169 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006170 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006171 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006172 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006173 try:
6174 RunGit(['checkout', branches[int(which)]])
6175 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006176 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006177 return 1
6178
6179 return 0
6180
6181
maruel@chromium.org29404b52014-09-08 22:58:00 +00006182def CMDlol(parser, args):
6183 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006184 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006185 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6186 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6187 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006188 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006189 return 0
6190
6191
Josip Sokcevic0399e172022-03-21 23:11:51 +00006192def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006193 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006194 print(utils.depot_tools_version())
6195
6196
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006197class OptionParser(optparse.OptionParser):
6198 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006199
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006200 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006201 optparse.OptionParser.__init__(
6202 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006203 self.add_option(
6204 '-v', '--verbose', action='count', default=0,
6205 help='Use 2 times for more debugging info')
6206
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006207 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006208 try:
6209 return self._parse_args(args)
6210 finally:
6211 # Regardless of success or failure of args parsing, we want to report
6212 # metrics, but only after logging has been initialized (if parsing
6213 # succeeded).
6214 global settings
6215 settings = Settings()
6216
Edward Lesmes9c349062021-05-06 20:02:39 +00006217 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006218 try:
6219 # GetViewVCUrl ultimately calls logging method.
6220 project_url = settings.GetViewVCUrl().strip('/+')
6221 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6222 metrics.collector.add('project_urls', [project_url])
6223 except subprocess2.CalledProcessError:
6224 # Occurs when command is not executed in a git repository
6225 # We should not fail here. If the command needs to be executed
6226 # in a repo, it will be raised later.
6227 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006228
6229 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006230 # Create an optparse.Values object that will store only the actual passed
6231 # options, without the defaults.
6232 actual_options = optparse.Values()
6233 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6234 # Create an optparse.Values object with the default options.
6235 options = optparse.Values(self.get_default_values().__dict__)
6236 # Update it with the options passed by the user.
6237 options._update_careful(actual_options.__dict__)
6238 # Store the options passed by the user in an _actual_options attribute.
6239 # We store only the keys, and not the values, since the values can contain
6240 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006241 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006242
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006243 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006244 logging.basicConfig(
6245 level=levels[min(options.verbose, len(levels) - 1)],
6246 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6247 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006248
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006249 return options, args
6250
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006251
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006252def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006253 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006254 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006255 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006256 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006257
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006258 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006259 dispatcher = subcommand.CommandDispatcher(__name__)
6260 try:
6261 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006262 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006263 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006264 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006265 if e.code != 500:
6266 raise
6267 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006268 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006269 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006270 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006271
6272
6273if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006274 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6275 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006276 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006277 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006278 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006279 sys.exit(main(sys.argv[1:]))