blob: 8f90a4efef92a9afe44561ab1a3981f406635adf [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
Dirk Pranke6f0df682021-06-25 00:42:33 +0000825 def GetUsePython3(self):
826 return self._GetConfig('rietveld.use-python3')
827
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000828 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000829 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000830 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000831 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
832 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000833 # Default is squash now (http://crbug.com/611892#c23).
834 self.squash_gerrit_uploads = self._GetConfig(
835 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000836 return self.squash_gerrit_uploads
837
Edward Lesmes4de54132020-05-05 19:41:33 +0000838 def GetSquashGerritUploadsOverride(self):
839 """Return True or False if codereview.settings should be overridden.
840
841 Returns None if no override has been defined.
842 """
843 # See also http://crbug.com/611892#c23
844 result = self._GetConfig('gerrit.override-squash-uploads').lower()
845 if result == 'true':
846 return True
847 if result == 'false':
848 return False
849 return None
850
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000851 def GetIsGerrit(self):
852 """Return True if gerrit.host is set."""
853 if self.is_gerrit is None:
854 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
855 return self.is_gerrit
856
tandrii@chromium.org28253532016-04-14 13:46:56 +0000857 def GetGerritSkipEnsureAuthenticated(self):
858 """Return True if EnsureAuthenticated should not be done for Gerrit
859 uploads."""
860 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000861 self.gerrit_skip_ensure_authenticated = self._GetConfig(
862 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000863 return self.gerrit_skip_ensure_authenticated
864
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000865 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000866 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000867 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000868 # Git requires single quotes for paths with spaces. We need to replace
869 # them with double quotes for Windows to treat such paths as a single
870 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000871 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000872 return self.git_editor or None
873
thestig@chromium.org44202a22014-03-11 19:22:18 +0000874 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000875 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000876
877 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000878 return self._GetConfig(
879 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000880
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000881 def GetFormatFullByDefault(self):
882 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000883 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000884 result = (
885 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
886 error_ok=True).strip())
887 self.format_full_by_default = (result == 'true')
888 return self.format_full_by_default
889
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000890 def IsStatusCommitOrderByDate(self):
891 if self.is_status_commit_order_by_date is None:
892 result = (RunGit(['config', '--bool', 'cl.date-order'],
893 error_ok=True).strip())
894 self.is_status_commit_order_by_date = (result == 'true')
895 return self.is_status_commit_order_by_date
896
Edward Lemur26964072020-02-19 19:18:51 +0000897 def _GetConfig(self, key, default=''):
898 self._LazyUpdateIfNeeded()
899 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000900
901
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000902class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000903 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000904 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000905 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000906 DRY_RUN = 'dry_run'
907 COMMIT = 'commit'
908
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000909 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000910
911
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000912class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000913 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000914 self.issue = issue
915 self.patchset = patchset
916 self.hostname = hostname
917
918 @property
919 def valid(self):
920 return self.issue is not None
921
922
Edward Lemurf38bc172019-09-03 21:02:13 +0000923def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000924 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
925 fail_result = _ParsedIssueNumberArgument()
926
Edward Lemur678a6842019-10-03 22:25:05 +0000927 if isinstance(arg, int):
928 return _ParsedIssueNumberArgument(issue=arg)
929 if not isinstance(arg, basestring):
930 return fail_result
931
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000933 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000936 if not url.startswith('http'):
937 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000938 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
939 if url.startswith(short_url):
940 url = gerrit_url + url[len(short_url):]
941 break
942
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000943 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000944 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000945 except ValueError:
946 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200947
Alex Turner30ae6372022-01-04 02:32:52 +0000948 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
949 # URL.
950 if not arg.startswith('http') and '.' not in parsed_url.netloc:
951 return fail_result
952
Edward Lemur678a6842019-10-03 22:25:05 +0000953 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
954 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
955 # Short urls like https://domain/<issue_number> can be used, but don't allow
956 # specifying the patchset (you'd 404), but we allow that here.
957 if parsed_url.path == '/':
958 part = parsed_url.fragment
959 else:
960 part = parsed_url.path
961
962 match = re.match(
963 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
964 if not match:
965 return fail_result
966
967 issue = int(match.group('issue'))
968 patchset = match.group('patchset')
969 return _ParsedIssueNumberArgument(
970 issue=issue,
971 patchset=int(patchset) if patchset else None,
972 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000973
974
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000975def _create_description_from_log(args):
976 """Pulls out the commit log to use as a base for the CL description."""
977 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000978 if len(args) == 1 and args[0] == None:
979 # Handle the case where None is passed as the branch.
980 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000981 if len(args) == 1 and not args[0].endswith('.'):
982 log_args = [args[0] + '..']
983 elif len(args) == 1 and args[0].endswith('...'):
984 log_args = [args[0][:-1]]
985 elif len(args) == 2:
986 log_args = [args[0] + '..' + args[1]]
987 else:
988 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000989 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000990
991
Aaron Gablea45ee112016-11-22 15:14:38 -0800992class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700993 def __init__(self, issue, url):
994 self.issue = issue
995 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700997
998 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800999 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001000 self.issue, self.url)
1001
1002
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001003_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001004 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001005 # TODO(tandrii): these two aren't known in Gerrit.
1006 'approval', 'disapproval'])
1007
1008
Joanna Wang6215dd02023-02-07 15:58:03 +00001009# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001010_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001011 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001012 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001013])
1014
1015
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001016class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 """Changelist works with one changelist in local branch.
1018
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001019 Notes:
1020 * Not safe for concurrent multi-{thread,process} use.
1021 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001022 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001023 """
1024
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001025 def __init__(self,
1026 branchref=None,
1027 issue=None,
1028 codereview_host=None,
1029 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """Create a new ChangeList instance.
1031
Edward Lemurf38bc172019-09-03 21:02:13 +00001032 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001033 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001035 global settings
1036 if not settings:
1037 # Happens when git_cl.py is used as a utility library.
1038 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001039
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001040 self.branchref = branchref
1041 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001042 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001043 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 else:
1045 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001046 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001048 self.lookedup_issue = False
1049 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001050 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001051 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001052 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001053 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001054 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001055 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001056 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001057
Edward Lemur125d60a2019-09-13 18:25:41 +00001058 # Lazily cached values.
1059 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1060 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001061 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001062 # Map from change number (issue) to its detail cache.
1063 self._detail_cache = {}
1064
1065 if codereview_host is not None:
1066 assert not codereview_host.startswith('https://'), codereview_host
1067 self._gerrit_host = codereview_host
1068 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001069
Edward Lesmese1576912021-02-16 21:53:34 +00001070 @property
1071 def owners_client(self):
1072 if self._owners_client is None:
1073 remote, remote_branch = self.GetRemoteBranch()
1074 branch = GetTargetRef(remote, remote_branch, None)
1075 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001076 host=self.GetGerritHost(),
1077 project=self.GetGerritProject(),
1078 branch=branch)
1079 return self._owners_client
1080
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001081 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001082 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001083
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001084 The return value is a string suitable for passing to git cl with the --cc
1085 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001086 """
1087 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001088 base_cc = settings.GetDefaultCCList()
1089 more_cc = ','.join(self.more_cc)
1090 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001091 return self.cc
1092
Daniel Cheng7227d212017-11-17 08:12:37 -08001093 def ExtendCC(self, more_cc):
1094 """Extends the list of users to cc on this CL based on the changed files."""
1095 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001097 def GetCommitDate(self):
1098 """Returns the commit date as provided in the constructor"""
1099 return self.commit_date
1100
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001102 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001103 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001104 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001105 if not branchref:
1106 return None
1107 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001108 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001109 return self.branch
1110
1111 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001112 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113 self.GetBranch() # Poke the lazy loader.
1114 return self.branchref
1115
Edward Lemur85153282020-02-14 22:06:29 +00001116 def _GitGetBranchConfigValue(self, key, default=None):
1117 return scm.GIT.GetBranchConfig(
1118 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001119
Edward Lemur85153282020-02-14 22:06:29 +00001120 def _GitSetBranchConfigValue(self, key, value):
1121 action = 'set %s to %r' % (key, value)
1122 if not value:
1123 action = 'unset %s' % key
1124 assert self.GetBranch(), 'a branch is needed to ' + action
1125 return scm.GIT.SetBranchConfig(
1126 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001127
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001128 @staticmethod
1129 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001130 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001131 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001133 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1134 settings.GetRoot(), branch)
1135 if not remote or not upstream_branch:
1136 DieWithError(
1137 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001138 'Verify this branch is set up to track another \n'
1139 '(via the --track argument to "git checkout -b ..."). \n'
1140 'or pass complete "git diff"-style arguments if supported, like\n'
1141 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142
1143 return remote, upstream_branch
1144
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001145 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001146 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001147 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001148 DieWithError('The upstream for the current branch (%s) does not exist '
1149 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001150 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001151 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001152
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 def GetUpstreamBranch(self):
1154 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001155 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001156 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001157 upstream_branch = upstream_branch.replace('refs/heads/',
1158 'refs/remotes/%s/' % remote)
1159 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1160 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001161 self.upstream_branch = upstream_branch
1162 return self.upstream_branch
1163
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001164 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001165 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001166 remote, branch = None, self.GetBranch()
1167 seen_branches = set()
1168 while branch not in seen_branches:
1169 seen_branches.add(branch)
1170 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001171 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001172 if remote != '.' or branch.startswith('refs/remotes'):
1173 break
1174 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 remotes = RunGit(['remote'], error_ok=True).split()
1176 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001177 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001178 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001180 logging.warning('Could not determine which remote this change is '
1181 'associated with, so defaulting to "%s".' %
1182 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001183 else:
Gavin Make6a62332020-12-04 21:57:10 +00001184 logging.warning('Could not determine which remote this change is '
1185 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001186 branch = 'HEAD'
1187 if branch.startswith('refs/remotes'):
1188 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001189 elif branch.startswith('refs/branch-heads/'):
1190 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001191 else:
1192 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001193 return self._remote
1194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001195 def GetRemoteUrl(self):
1196 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1197
1198 Returns None if there is no remote.
1199 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001200 is_cached, value = self._cached_remote_url
1201 if is_cached:
1202 return value
1203
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001204 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001205 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001206
Edward Lemur298f2cf2019-02-22 21:40:39 +00001207 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001208 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001209 if host:
1210 self._cached_remote_url = (True, url)
1211 return url
1212
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001213 # If it cannot be parsed as an url, assume it is a local directory,
1214 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001215 logging.warning('"%s" doesn\'t appear to point to a git host. '
1216 'Interpreting it as a local directory.', url)
1217 if not os.path.isdir(url):
1218 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001219 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1220 'but it doesn\'t exist.',
1221 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001222 return None
1223
1224 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001225 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001226
Edward Lemur79d4f992019-11-11 23:49:02 +00001227 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001228 if not host:
1229 logging.error(
1230 'Remote "%(remote)s" for branch "%(branch)s" points to '
1231 '"%(cache_path)s", but it is misconfigured.\n'
1232 '"%(cache_path)s" must be a git repo and must have a remote named '
1233 '"%(remote)s" pointing to the git host.', {
1234 'remote': remote,
1235 'cache_path': cache_path,
1236 'branch': self.GetBranch()})
1237 return None
1238
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001239 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001240 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001242 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001243 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001244 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001245 if self.GetBranch():
1246 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001247 if self.issue is not None:
1248 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001249 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 return self.issue
1251
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001252 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001254 issue = self.GetIssue()
1255 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001256 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001257 server = self.GetCodereviewServer()
1258 if short:
1259 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1260 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261
Dirk Pranke6f0df682021-06-25 00:42:33 +00001262 def GetUsePython3(self):
Josip Sokcevic340edc32021-07-08 17:01:46 +00001263 return settings.GetUsePython3()
Dirk Pranke6f0df682021-06-25 00:42:33 +00001264
Edward Lemur6c6827c2020-02-06 21:15:18 +00001265 def FetchDescription(self, pretty=False):
1266 assert self.GetIssue(), 'issue is required to query Gerrit'
1267
Edward Lemur9aa1a962020-02-25 00:58:38 +00001268 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001269 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1270 current_rev = data['current_revision']
1271 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001272
1273 if not pretty:
1274 return self.description
1275
1276 # Set width to 72 columns + 2 space indent.
1277 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1278 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1279 lines = self.description.splitlines()
1280 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001281
1282 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001283 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001284 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001285 if self.GetBranch():
1286 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001287 if self.patchset is not None:
1288 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001289 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 return self.patchset
1291
Edward Lemur9aa1a962020-02-25 00:58:38 +00001292 def GetAuthor(self):
1293 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001296 """Set this branch's patchset. If patchset=0, clears the patchset."""
1297 assert self.GetBranch()
1298 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001299 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001300 else:
1301 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001302 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001304 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001305 """Set this branch's issue. If issue isn't given, clears the issue."""
1306 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001307 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001308 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001309 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001310 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001311 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001312 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001313 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001314 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001315 else:
tandrii5d48c322016-08-18 16:19:37 -07001316 # Reset all of these just to be clean.
1317 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001318 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001319 ISSUE_CONFIG_KEY,
1320 PATCHSET_CONFIG_KEY,
1321 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001322 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001323 ]
tandrii5d48c322016-08-18 16:19:37 -07001324 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001325 try:
1326 self._GitSetBranchConfigValue(prop, None)
1327 except subprocess2.CalledProcessError:
1328 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001329 msg = RunGit(['log', '-1', '--format=%B']).strip()
1330 if msg and git_footers.get_footer_change_id(msg):
1331 print('WARNING: The change patched into this branch has a Change-Id. '
1332 'Removing it.')
1333 RunGit(['commit', '--amend', '-m',
1334 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001335 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001336 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001337 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001338
Joanna Wangb46232e2023-01-21 01:58:46 +00001339 def GetAffectedFiles(self, upstream, end_commit=None):
1340 # type: (str, Optional[str]) -> Sequence[str]
1341 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001342 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001343 return [
1344 f for _, f in scm.GIT.CaptureStatus(
1345 settings.GetRoot(), upstream, end_commit=end_commit)
1346 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001347 except subprocess2.CalledProcessError:
1348 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001349 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001350 'This branch probably doesn\'t exist anymore. To reset the\n'
1351 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001352 ' git branch --set-upstream-to origin/main %s\n'
1353 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001354 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001355
dsansomee2d6fd92016-09-08 00:10:47 -07001356 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001357 assert self.GetIssue(), 'issue is required to update description'
1358
1359 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001360 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001361 if not force:
1362 confirm_or_exit(
1363 'The description cannot be modified while the issue has a pending '
1364 'unpublished edit. Either publish the edit in the Gerrit web UI '
1365 'or delete it.\n\n', action='delete the unpublished edit')
1366
1367 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001368 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001369 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001370 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001371 description, notify='NONE')
1372
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001373 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001374
Edward Lemur75526302020-02-27 22:31:05 +00001375 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001376 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001377 '--root', settings.GetRoot(),
1378 '--upstream', upstream,
1379 ]
1380
1381 args.extend(['--verbose'] * verbose)
1382
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001383 remote, remote_branch = self.GetRemoteBranch()
1384 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001385 if settings.GetIsGerrit():
1386 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1387 args.extend(['--gerrit_project', self.GetGerritProject()])
1388 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001389
Edward Lemur99df04e2020-03-05 19:39:43 +00001390 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001391 issue = self.GetIssue()
1392 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001393 if author:
1394 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001395 if issue:
1396 args.extend(['--issue', str(issue)])
1397 if patchset:
1398 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001399
Edward Lemur75526302020-02-27 22:31:05 +00001400 return args
1401
Josip Sokcevic017544d2022-03-31 23:47:53 +00001402 def RunHook(self,
1403 committing,
1404 may_prompt,
1405 verbose,
1406 parallel,
1407 upstream,
1408 description,
1409 all_files,
1410 files=None,
1411 resultdb=False,
1412 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001413 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1414 args = self._GetCommonPresubmitArgs(verbose, upstream)
1415 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001416 if may_prompt:
1417 args.append('--may_prompt')
1418 if parallel:
1419 args.append('--parallel')
1420 if all_files:
1421 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001422 if files:
1423 args.extend(files.split(';'))
1424 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001425 if files or all_files:
1426 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001427
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001428 if resultdb and not realm:
1429 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1430 # it is not required to pass the realm flag
1431 print('Note: ResultDB reporting will NOT be performed because --realm'
1432 ' was not specified. To enable ResultDB, please run the command'
1433 ' again with the --realm argument to specify the LUCI realm.')
1434
Bruce Dawson119cff32023-05-09 18:07:19 +00001435 return self._RunPresubmit(args,
1436 description,
1437 use_python3=True,
1438 resultdb=resultdb,
1439 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001440
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001441 def _RunPresubmit(self,
1442 args,
1443 description,
1444 use_python3,
1445 resultdb=None,
1446 realm=None):
1447 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1448 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001449 args = args[:]
1450 vpython = 'vpython3' if use_python3 else 'vpython'
1451
Edward Lemur227d5102020-02-25 23:45:35 +00001452 with gclient_utils.temporary_file() as description_file:
1453 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001454 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001455 args.extend(['--json_output', json_output])
1456 args.extend(['--description_file', description_file])
Dirk Pranke6f0df682021-06-25 00:42:33 +00001457 if self.GetUsePython3():
1458 args.append('--use-python3')
Edward Lemur227d5102020-02-25 23:45:35 +00001459 start = time_time()
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001460 cmd = [vpython, PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001461 if resultdb and realm:
1462 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001463
1464 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001465 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001466
Edward Lemur227d5102020-02-25 23:45:35 +00001467 metrics.collector.add_repeated('sub_commands', {
1468 'command': 'presubmit',
1469 'execution_time': time_time() - start,
1470 'exit_code': exit_code,
1471 })
1472
1473 if exit_code:
1474 sys.exit(exit_code)
1475
1476 json_results = gclient_utils.FileRead(json_output)
1477 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001478
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001479 def _MergePresubmitResults(self, py2_results, py3_results):
1480 return {
1481 'more_cc': sorted(set(py2_results.get('more_cc', []) +
1482 py3_results.get('more_cc', []))),
1483 'errors': (
1484 py2_results.get('errors', []) + py3_results.get('errors', [])),
1485 'notifications': (
1486 py2_results.get('notifications', []) +
1487 py3_results.get('notifications', [])),
1488 'warnings': (
1489 py2_results.get('warnings', []) + py3_results.get('warnings', []))
1490 }
1491
Brian Sheedy7326ca22022-11-02 18:36:17 +00001492 def RunPostUploadHook(self, verbose, upstream, description, py3_only):
Edward Lemur75526302020-02-27 22:31:05 +00001493 args = self._GetCommonPresubmitArgs(verbose, upstream)
1494 args.append('--post_upload')
1495
1496 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001497 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001498 args.extend(['--description_file', description_file])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001499 run_py2 = not py3_only and os.getenv('LUCI_OMIT_PYTHON2') != 'true'
1500 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001501 p_py2 = subprocess2.Popen(['vpython', PRESUBMIT_SUPPORT] + args)
1502 p_py3 = subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args +
1503 ['--use-python3'])
Michael Achenbachb5cec8c2023-04-21 15:42:26 +00001504 if run_py2:
Josip Sokcevic48d8e902023-03-09 02:38:26 +00001505 p_py2.wait()
1506 p_py3.wait()
Edward Lemur75526302020-02-27 22:31:05 +00001507
Edward Lemur5a644f82020-03-18 16:44:57 +00001508 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001509 # type: (optparse.Values, Sequence[str], Sequence[str]
1510 # ) -> ChangeDescription
1511 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001512 if self.GetIssue():
1513 description = self.FetchDescription()
1514 elif options.message:
1515 description = options.message
1516 else:
1517 description = _create_description_from_log(git_diff_args)
1518 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001519 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001520
Edward Lemur5a644f82020-03-18 16:44:57 +00001521 bug = options.bug
1522 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001523 if not self.GetIssue():
1524 # Extract bug number from branch name, but only if issue is being created.
1525 # It must start with bug or fix, followed by _ or - and number.
1526 # Optionally, it may contain _ or - after number with arbitrary text.
1527 # Examples:
1528 # bug-123
1529 # bug_123
1530 # fix-123
1531 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001532 branch = self.GetBranch()
1533 if branch is not None:
1534 match = re.match(
1535 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1536 if not bug and not fixed and match:
1537 if match.group('type') == 'bug':
1538 bug = match.group('bugnum')
1539 else:
1540 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001541
1542 change_description = ChangeDescription(description, bug, fixed)
1543
Joanna Wang39811b12023-01-20 23:09:48 +00001544 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001545 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001546 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001547 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001548 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001549 missing_files = [
1550 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001551 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001552 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001553 owners = self.owners_client.SuggestOwners(
1554 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001555 assert isinstance(options.reviewers, list), options.reviewers
1556 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001557
Edward Lemur5a644f82020-03-18 16:44:57 +00001558 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001559 if options.reviewers:
1560 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001561
1562 return change_description
1563
Joanna Wanga1abbed2023-01-24 01:41:05 +00001564 def _GetTitleForUpload(self, options, multi_change_upload=False):
1565 # type: (optparse.Values, Optional[bool]) -> str
1566
1567 # Getting titles for multipl commits is not supported so we return the
1568 # default.
1569 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001570 return options.title
1571
1572 # On first upload, patchset title is always this string, while options.title
1573 # gets converted to first line of message.
1574 if not self.GetIssue():
1575 return 'Initial upload'
1576
1577 # When uploading subsequent patchsets, options.message is taken as the title
1578 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001579 if options.message:
1580 return options.message.strip()
1581
1582 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001583 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001584 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001585 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001586 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001587
1588 # Use the default title if the user confirms the default with a 'y'.
1589 if user_title.lower() == 'y':
1590 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001591 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001592
Joanna Wang562481d2023-01-26 21:57:14 +00001593 def _GetRefSpecOptions(self,
1594 options,
1595 change_desc,
1596 multi_change_upload=False,
1597 dogfood_path=False):
1598 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1599 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001600
1601 # Extra options that can be specified at push time. Doc:
1602 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1603 refspec_opts = []
1604
1605 # By default, new changes are started in WIP mode, and subsequent patchsets
1606 # don't send email. At any time, passing --send-mail or --send-email will
1607 # mark the change ready and send email for that particular patch.
1608 if options.send_mail:
1609 refspec_opts.append('ready')
1610 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001611 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001612 refspec_opts.append('wip')
1613 else:
1614 refspec_opts.append('notify=NONE')
1615
1616 # TODO(tandrii): options.message should be posted as a comment if
1617 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1618 # to do it.
1619
1620 # Set options.title in case user was prompted in _GetTitleForUpload and
1621 # _CMDUploadChange needs to be called again.
1622 options.title = self._GetTitleForUpload(
1623 options, multi_change_upload=multi_change_upload)
1624
1625 if options.title:
1626 # Punctuation and whitespace in |title| must be percent-encoded.
1627 refspec_opts.append('m=' +
1628 gerrit_util.PercentEncodeForGitRef(options.title))
1629
1630 if options.private:
1631 refspec_opts.append('private')
1632
1633 if options.topic:
1634 # Documentation on Gerrit topics is here:
1635 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1636 refspec_opts.append('topic=%s' % options.topic)
1637
1638 if options.enable_auto_submit:
1639 refspec_opts.append('l=Auto-Submit+1')
1640 if options.set_bot_commit:
1641 refspec_opts.append('l=Bot-Commit+1')
1642 if options.use_commit_queue:
1643 refspec_opts.append('l=Commit-Queue+2')
1644 elif options.cq_dry_run:
1645 refspec_opts.append('l=Commit-Queue+1')
1646 elif options.cq_quick_run:
1647 refspec_opts.append('l=Commit-Queue+1')
1648 refspec_opts.append('l=Quick-Run+1')
1649
1650 if change_desc.get_reviewers(tbr_only=True):
1651 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1652 self.GetGerritProject())
1653 refspec_opts.append('l=Code-Review+%s' % score)
1654
Joanna Wang40497912023-01-24 21:18:16 +00001655 # Gerrit sorts hashtags, so order is not important.
1656 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1657 # We check GetIssue because we only add hashtags from the
1658 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001659 # TODO(b/265929888): When we fully launch the new path:
1660 # 1) remove fetching hashtags from description alltogether
1661 # 2) Or use descrtiption hashtags for:
1662 # `not (self.GetIssue() and multi_change_upload)`
1663 # 3) Or enabled change description tags for multi and single changes
1664 # by adding them post `git push`.
1665 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001666 hashtags.update(change_desc.get_hash_tags())
1667 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001668
1669 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001670 # branch/change.
1671 return refspec_opts
1672
Joanna Wang05b60342023-03-29 20:25:57 +00001673 def PrepareSquashedCommit(self,
1674 options,
1675 parent,
1676 orig_parent,
1677 end_commit=None):
1678 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1679 """Create a squashed commit to upload.
1680
1681
1682 Args:
1683 parent: The commit to use as the parent for the new squashed.
1684 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1685 is part of the same original tree as end_commit, which does not
1686 contain squashed commits. This is used to create the change
1687 description for the new squashed commit with:
1688 `git log orig_parent..end_commit`.
1689 end_commit: The commit to use as the end of the new squashed commit.
1690 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001691
1692 if end_commit is None:
1693 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1694
Joanna Wang05b60342023-03-29 20:25:57 +00001695 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001696 end_commit)
1697 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1698 with gclient_utils.temporary_file() as desc_tempfile:
1699 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1700 commit_to_push = RunGit(
1701 ['commit-tree', latest_tree, '-p', parent, '-F',
1702 desc_tempfile]).strip()
1703
Joanna Wang7603f042023-03-01 22:17:36 +00001704 # Gerrit may or may not update fast enough to return the correct patchset
1705 # number after we push. Get the pre-upload patchset and increment later.
1706 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001707 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001708 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001709
Joanna Wang6215dd02023-02-07 15:58:03 +00001710 def PrepareCherryPickSquashedCommit(self, options, parent):
1711 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001712 """Create a commit cherry-picked on parent to push."""
1713
Joanna Wang6215dd02023-02-07 15:58:03 +00001714 # The `parent` is what we will cherry-pick on top of.
1715 # The `cherry_pick_base` is the beginning range of what
1716 # we are cherry-picking.
1717 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1718 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001719 self.branchref)
1720
1721 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1722 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1723 with gclient_utils.temporary_file() as desc_tempfile:
1724 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001725 commit_to_cp = RunGit([
1726 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1727 desc_tempfile
1728 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001729
Joanna Wang6215dd02023-02-07 15:58:03 +00001730 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001731 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1732 if ret:
1733 RunGit(['cherry-pick', '--abort'])
1734 RunGit(['checkout', '-q', self.branch])
1735 DieWithError('Could not cleanly cherry-pick')
1736
Joanna Wang6215dd02023-02-07 15:58:03 +00001737 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001738 RunGit(['checkout', '-q', self.branch])
1739
Joanna Wang7603f042023-03-01 22:17:36 +00001740 # Gerrit may or may not update fast enough to return the correct patchset
1741 # number after we push. Get the pre-upload patchset and increment later.
1742 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001743 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001744 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001745
Joanna Wangb46232e2023-01-21 01:58:46 +00001746 def _PrepareChange(self, options, parent, end_commit):
1747 # type: (optparse.Values, str, str) ->
1748 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1749 """Prepares the change to be uploaded."""
1750 self.EnsureCanUploadPatchset(options.force)
1751
1752 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1753 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1754 files)
1755
1756 watchlist = watchlists.Watchlists(settings.GetRoot())
1757 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1758 if not options.bypass_hooks:
1759 hook_results = self.RunHook(committing=False,
1760 may_prompt=not options.force,
1761 verbose=options.verbose,
1762 parallel=options.parallel,
1763 upstream=parent,
1764 description=change_desc.description,
1765 all_files=False)
1766 self.ExtendCC(hook_results['more_cc'])
1767
1768 # Update the change description and ensure we have a Change Id.
1769 if self.GetIssue():
1770 if options.edit_description:
1771 change_desc.prompt()
1772 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1773 change_id = change_detail['change_id']
1774 change_desc.ensure_change_id(change_id)
1775
Joanna Wangb46232e2023-01-21 01:58:46 +00001776 else: # No change issue. First time uploading
1777 if not options.force and not options.message_file:
1778 change_desc.prompt()
1779
1780 # Check if user added a change_id in the descripiton.
1781 change_ids = git_footers.get_footer_change_id(change_desc.description)
1782 if len(change_ids) == 1:
1783 change_id = change_ids[0]
1784 else:
1785 change_id = GenerateGerritChangeId(change_desc.description)
1786 change_desc.ensure_change_id(change_id)
1787
1788 if options.preserve_tryjobs:
1789 change_desc.set_preserve_tryjobs()
1790
1791 SaveDescriptionBackup(change_desc)
1792
1793 # Add ccs
1794 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001795 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001796 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001797 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001798 ccs = self.GetCCList().split(',')
1799 if len(ccs) > 100:
1800 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1801 'process/lsc/lsc_workflow.md')
1802 print('WARNING: This will auto-CC %s users.' % len(ccs))
1803 print('LSC may be more appropriate: %s' % lsc)
1804 print('You can also use the --no-autocc flag to disable auto-CC.')
1805 confirm_or_exit(action='continue')
1806
1807 # Add ccs from the --cc flag.
1808 if options.cc:
1809 ccs.extend(options.cc)
1810
1811 ccs = [email.strip() for email in ccs if email.strip()]
1812 if change_desc.get_cced():
1813 ccs.extend(change_desc.get_cced())
1814
1815 return change_desc.get_reviewers(), ccs, change_desc
1816
Joanna Wang40497912023-01-24 21:18:16 +00001817 def PostUploadUpdates(self, options, new_upload, change_number):
1818 # type: (optparse.Values, _NewUpload, change_number) -> None
1819 """Makes necessary post upload changes to the local and remote cl."""
1820 if not self.GetIssue():
1821 self.SetIssue(change_number)
1822
Joanna Wang7603f042023-03-01 22:17:36 +00001823 self.SetPatchset(new_upload.prev_patchset + 1)
1824
Joanna Wang40497912023-01-24 21:18:16 +00001825 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1826 new_upload.commit_to_push)
1827 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1828 new_upload.new_last_uploaded_commit)
1829
1830 if settings.GetRunPostUploadHook():
1831 self.RunPostUploadHook(options.verbose, new_upload.parent,
1832 new_upload.change_desc.description,
1833 options.no_python2_post_upload_hooks)
1834
1835 if new_upload.reviewers or new_upload.ccs:
1836 gerrit_util.AddReviewers(self.GetGerritHost(),
1837 self._GerritChangeIdentifier(),
1838 reviewers=new_upload.reviewers,
1839 ccs=new_upload.ccs,
1840 notify=bool(options.send_mail))
1841
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001842 def CMDUpload(self, options, git_diff_args, orig_args):
1843 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001844 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001846 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001847 else:
1848 if self.GetBranch() is None:
1849 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1850
1851 # Default to diffing against common ancestor of upstream branch
1852 base_branch = self.GetCommonAncestorWithUpstream()
1853 git_diff_args = [base_branch, 'HEAD']
1854
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001855 # Fast best-effort checks to abort before running potentially expensive
1856 # hooks if uploading is likely to fail anyway. Passing these checks does
1857 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001858 self.EnsureAuthenticated(force=options.force)
1859 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001860
1861 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001862 watchlist = watchlists.Watchlists(settings.GetRoot())
1863 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001865 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001866
Edward Lemur5a644f82020-03-18 16:44:57 +00001867 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001868 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001869 hook_results = self.RunHook(committing=False,
1870 may_prompt=not options.force,
1871 verbose=options.verbose,
1872 parallel=options.parallel,
1873 upstream=base_branch,
1874 description=change_desc.description,
1875 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001876 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001877
Aaron Gable13101a62018-02-09 13:20:41 -08001878 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001879 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001880 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001881 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001882 if self.GetBranch() is not None:
1883 self._GitSetBranchConfigValue(
1884 LAST_UPLOAD_HASH_CONFIG_KEY,
1885 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001886 # Run post upload hooks, if specified.
1887 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001888 self.RunPostUploadHook(options.verbose, base_branch,
1889 change_desc.description,
1890 options.no_python2_post_upload_hooks)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001891
1892 # Upload all dependencies if specified.
1893 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001894 print()
1895 print('--dependencies has been specified.')
1896 print('All dependent local branches will be re-uploaded.')
1897 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001898 # Remove the dependencies flag from args so that we do not end up in a
1899 # loop.
1900 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001901 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001902 return ret
1903
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001904 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001905 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001906
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001907 Issue must have been already uploaded and known. Optionally allows for
1908 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001909 """
1910 assert new_state in _CQState.ALL_STATES
1911 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001912 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001913 vote_map = {
1914 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001915 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001916 _CQState.DRY_RUN: 1,
1917 _CQState.COMMIT: 2,
1918 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001919 if new_state == _CQState.QUICK_RUN:
1920 labels = {
1921 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1922 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1923 }
1924 else:
1925 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001926 notify = False if new_state == _CQState.DRY_RUN else None
1927 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001928 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001929 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001930 return 0
1931 except KeyboardInterrupt:
1932 raise
1933 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001934 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001935 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001936 ' * Your project has no CQ,\n'
1937 ' * You don\'t have permission to change the CQ state,\n'
1938 ' * There\'s a bug in this code (see stack trace below).\n'
1939 'Consider specifying which bots to trigger manually or asking your '
1940 'project owners for permissions or contacting Chrome Infra at:\n'
1941 'https://www.chromium.org/infra\n\n' %
1942 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001943 # Still raise exception so that stack trace is printed.
1944 raise
1945
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001946 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 # Lazy load of configs.
1948 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001949 if self._gerrit_host and '.' not in self._gerrit_host:
1950 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1951 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001952 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001953 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001954 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001955 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001956 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1957 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001958 return self._gerrit_host
1959
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001960 def _GetGitHost(self):
1961 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001962 remote_url = self.GetRemoteUrl()
1963 if not remote_url:
1964 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001965 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001966
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001967 def GetCodereviewServer(self):
1968 if not self._gerrit_server:
1969 # If we're on a branch then get the server potentially associated
1970 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001971 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001972 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001973 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001974 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001975 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001976 if not self._gerrit_server:
1977 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1978 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001979 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001980 parts[0] = parts[0] + '-review'
1981 self._gerrit_host = '.'.join(parts)
1982 self._gerrit_server = 'https://%s' % self._gerrit_host
1983 return self._gerrit_server
1984
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001985 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001986 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001987 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001988 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001989 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001990 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001991 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001992 if project.endswith('.git'):
1993 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001994 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1995 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1996 # gitiles/git-over-https protocol. E.g.,
1997 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1998 # as
1999 # https://chromium.googlesource.com/v8/v8
2000 if project.startswith('a/'):
2001 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002002 return project
2003
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002004 def _GerritChangeIdentifier(self):
2005 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2006
2007 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002008 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002009 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002010 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002011 if project:
2012 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2013 # Fall back on still unique, but less efficient change number.
2014 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002015
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002016 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002017 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002018 if settings.GetGerritSkipEnsureAuthenticated():
2019 # For projects with unusual authentication schemes.
2020 # See http://crbug.com/603378.
2021 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002022
2023 # Check presence of cookies only if using cookies-based auth method.
2024 cookie_auth = gerrit_util.Authenticator.get()
2025 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002026 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002027
Florian Mayerae510e82020-01-30 21:04:48 +00002028 remote_url = self.GetRemoteUrl()
2029 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00002030 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00002031 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00002032 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2033 logging.warning(
2034 'Ignoring branch %(branch)s with non-https/sso remote '
2035 '%(remote)s', {
2036 'branch': self.branch,
2037 'remote': self.GetRemoteUrl()
2038 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002039 return
2040
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002041 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002042 self.GetCodereviewServer()
2043 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002044 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002045
2046 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2047 git_auth = cookie_auth.get_auth_header(git_host)
2048 if gerrit_auth and git_auth:
2049 if gerrit_auth == git_auth:
2050 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002051 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002052 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002053 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002054 ' %s\n'
2055 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002056 ' Consider running the following command:\n'
2057 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002058 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002059 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002060 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002061 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002062 cookie_auth.get_new_password_message(git_host)))
2063 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002064 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002065 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002066
2067 missing = (
2068 ([] if gerrit_auth else [self._gerrit_host]) +
2069 ([] if git_auth else [git_host]))
2070 DieWithError('Credentials for the following hosts are required:\n'
2071 ' %s\n'
2072 'These are read from %s (or legacy %s)\n'
2073 '%s' % (
2074 '\n '.join(missing),
2075 cookie_auth.get_gitcookies_path(),
2076 cookie_auth.get_netrc_path(),
2077 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002078
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002079 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002080 if not self.GetIssue():
2081 return
2082
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002083 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002084 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002085 DieWithError(
2086 'Change %s has been abandoned, new uploads are not allowed' %
2087 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002088 if status == 'MERGED':
2089 answer = gclient_utils.AskForData(
2090 'Change %s has been submitted, new uploads are not allowed. '
2091 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2092 ).lower()
2093 if answer not in ('y', ''):
2094 DieWithError('New uploads are not allowed.')
2095 self.SetIssue()
2096 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002097
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002098 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2099 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2100 # Apparently this check is not very important? Otherwise get_auth_email
2101 # could have been added to other implementations of Authenticator.
2102 cookies_auth = gerrit_util.Authenticator.get()
2103 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002104 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002105
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002106 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002107 if self.GetIssueOwner() == cookies_user:
2108 return
2109 logging.debug('change %s owner is %s, cookies user is %s',
2110 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002111 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002112 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002113 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002114 if details['email'] == self.GetIssueOwner():
2115 return
2116 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002117 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002118 'as %s.\n'
2119 'Uploading may fail due to lack of permissions.' %
2120 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2121 confirm_or_exit(action='upload')
2122
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002123 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002124 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002125 or CQ status, assuming adherence to a common workflow.
2126
2127 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002128 * 'error' - error from review tool (including deleted issues)
2129 * 'unsent' - no reviewers added
2130 * 'waiting' - waiting for review
2131 * 'reply' - waiting for uploader to reply to review
2132 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002133 * 'dry-run' - dry-running in the CQ
2134 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002135 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002136 """
2137 if not self.GetIssue():
2138 return None
2139
2140 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002141 data = self._GetChangeDetail([
2142 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002143 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002144 return 'error'
2145
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002146 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002147 return 'closed'
2148
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002149 cq_label = data['labels'].get('Commit-Queue', {})
2150 max_cq_vote = 0
2151 for vote in cq_label.get('all', []):
2152 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2153 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002154 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002155 if max_cq_vote == 1:
2156 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002157
Aaron Gable9ab38c62017-04-06 14:36:33 -07002158 if data['labels'].get('Code-Review', {}).get('approved'):
2159 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002160
2161 if not data.get('reviewers', {}).get('REVIEWER', []):
2162 return 'unsent'
2163
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002164 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002165 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002166 while messages:
2167 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002168 if (m.get('tag', '').startswith('autogenerated:cq') or
2169 m.get('tag', '').startswith('autogenerated:cv')):
2170 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002171 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002172 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002173 # Most recent message was by owner.
2174 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002175
2176 # Some reply from non-owner.
2177 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002178
2179 # Somehow there are no messages even though there are reviewers.
2180 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002181
Gavin Mak4e5e3992022-11-14 22:40:12 +00002182 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002183 if not self.GetIssue():
2184 return None
2185
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002186 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002187 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002188 if update:
2189 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002190 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002191
Gavin Makf35a9eb2022-11-17 18:34:36 +00002192 def _IsPatchsetRangeSignificant(self, lower, upper):
2193 """Returns True if the inclusive range of patchsets contains any reworks or
2194 rebases."""
2195 if not self.GetIssue():
2196 return False
2197
2198 data = self._GetChangeDetail(['ALL_REVISIONS'])
2199 ps_kind = {}
2200 for rev_info in data.get('revisions', {}).values():
2201 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2202
2203 for ps in range(lower, upper + 1):
2204 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2205 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2206 return True
2207 return False
2208
Gavin Make61ccc52020-11-13 00:12:57 +00002209 def GetMostRecentDryRunPatchset(self):
2210 """Get patchsets equivalent to the most recent patchset and return
2211 the patchset with the latest dry run. If none have been dry run, return
2212 the latest patchset."""
2213 if not self.GetIssue():
2214 return None
2215
2216 data = self._GetChangeDetail(['ALL_REVISIONS'])
2217 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002218 dry_run = {int(m['_revision_number'])
2219 for m in data.get('messages', [])
2220 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002221
2222 for revision_info in sorted(data.get('revisions', {}).values(),
2223 key=lambda c: c['_number'], reverse=True):
2224 if revision_info['_number'] in dry_run:
2225 patchset = revision_info['_number']
2226 break
2227 if revision_info.get('kind', '') not in \
2228 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2229 break
2230 self.SetPatchset(patchset)
2231 return patchset
2232
Aaron Gable636b13f2017-07-14 10:42:48 -07002233 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002234 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002235 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002236 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002237
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002238 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002239 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002240 # CURRENT_REVISION is included to get the latest patchset so that
2241 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002242 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002243 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2244 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002245 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002246 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002247 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002248 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002249
2250 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002251 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002252 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002253 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002254 line_comments = file_comments.setdefault(path, [])
2255 line_comments.extend(
2256 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002257
2258 # Build dictionary of file comments for easy access and sorting later.
2259 # {author+date: {path: {patchset: {line: url+message}}}}
2260 comments = collections.defaultdict(
2261 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002262
2263 server = self.GetCodereviewServer()
2264 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2265 # /c/ is automatically added by short URL server.
2266 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2267 self.GetIssue())
2268 else:
2269 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2270
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002271 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002272 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002273 tag = comment.get('tag', '')
2274 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002275 continue
2276 key = (comment['author']['email'], comment['updated'])
2277 if comment.get('side', 'REVISION') == 'PARENT':
2278 patchset = 'Base'
2279 else:
2280 patchset = 'PS%d' % comment['patch_set']
2281 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002282 url = ('%s/%s/%s#%s%s' %
2283 (url_prefix, comment['patch_set'], path,
2284 'b' if comment.get('side') == 'PARENT' else '',
2285 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002286 comments[key][path][patchset][line] = (url, comment['message'])
2287
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002288 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002289 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002290 summary = self._BuildCommentSummary(msg, comments, readable)
2291 if summary:
2292 summaries.append(summary)
2293 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002294
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002295 @staticmethod
2296 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002297 if 'email' not in msg['author']:
2298 # Some bot accounts may not have an email associated.
2299 return None
2300
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002301 key = (msg['author']['email'], msg['date'])
2302 # Don't bother showing autogenerated messages that don't have associated
2303 # file or line comments. this will filter out most autogenerated
2304 # messages, but will keep robot comments like those from Tricium.
2305 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2306 if is_autogenerated and not comments.get(key):
2307 return None
2308 message = msg['message']
2309 # Gerrit spits out nanoseconds.
2310 assert len(msg['date'].split('.')[-1]) == 9
2311 date = datetime.datetime.strptime(msg['date'][:-3],
2312 '%Y-%m-%d %H:%M:%S.%f')
2313 if key in comments:
2314 message += '\n'
2315 for path, patchsets in sorted(comments.get(key, {}).items()):
2316 if readable:
2317 message += '\n%s' % path
2318 for patchset, lines in sorted(patchsets.items()):
2319 for line, (url, content) in sorted(lines.items()):
2320 if line:
2321 line_str = 'Line %d' % line
2322 path_str = '%s:%d:' % (path, line)
2323 else:
2324 line_str = 'File comment'
2325 path_str = '%s:0:' % path
2326 if readable:
2327 message += '\n %s, %s: %s' % (patchset, line_str, url)
2328 message += '\n %s\n' % content
2329 else:
2330 message += '\n%s ' % path_str
2331 message += '\n%s\n' % content
2332
2333 return _CommentSummary(
2334 date=date,
2335 message=message,
2336 sender=msg['author']['email'],
2337 autogenerated=is_autogenerated,
2338 # These could be inferred from the text messages and correlated with
2339 # Code-Review label maximum, however this is not reliable.
2340 # Leaving as is until the need arises.
2341 approval=False,
2342 disapproval=False,
2343 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002344
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002345 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002346 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002347 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002348
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002349 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002350 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002351 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002352
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002353 def _GetChangeDetail(self, options=None):
2354 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002356 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002357
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002358 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002359 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002360 options.append('CURRENT_COMMIT')
2361
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002362 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002363 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002364 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002365
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002366 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2367 # Assumption: data fetched before with extra options is suitable
2368 # for return for a smaller set of options.
2369 # For example, if we cached data for
2370 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2371 # and request is for options=[CURRENT_REVISION],
2372 # THEN we can return prior cached data.
2373 if options_set.issubset(cached_options_set):
2374 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002375
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002376 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002377 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002378 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002379 except gerrit_util.GerritError as e:
2380 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002381 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002382 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002383
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002384 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002385 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002386
Gavin Mak4e5e3992022-11-14 22:40:12 +00002387 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002388 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002389 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002390 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2391 self._GerritChangeIdentifier(),
2392 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002393 except gerrit_util.GerritError as e:
2394 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002395 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002396 raise
agable32978d92016-11-01 12:55:02 -07002397 return data
2398
Karen Qian40c19422019-03-13 21:28:29 +00002399 def _IsCqConfigured(self):
2400 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002401 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002402
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002403 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002404 if git_common.is_dirty_git_tree('land'):
2405 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002406
tandriid60367b2016-06-22 05:25:12 -07002407 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002408 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002409 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002410 'which can test and land changes for you. '
2411 'Are you sure you wish to bypass it?\n',
2412 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002413 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002414 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002415 # Note: git diff outputs nothing if there is no diff.
2416 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002417 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002418 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002419 if detail['current_revision'] == last_upload:
2420 differs = False
2421 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002422 print('WARNING: Local branch contents differ from latest uploaded '
2423 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002424 if differs:
2425 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002426 confirm_or_exit(
2427 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2428 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002429 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002430 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002431 upstream = self.GetCommonAncestorWithUpstream()
2432 if self.GetIssue():
2433 description = self.FetchDescription()
2434 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002435 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002436 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002437 committing=True,
2438 may_prompt=not force,
2439 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002440 parallel=parallel,
2441 upstream=upstream,
2442 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002443 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002444 resultdb=resultdb,
2445 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002446
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002447 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002448 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002449 links = self._GetChangeCommit().get('web_links', [])
2450 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002451 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002452 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002453 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002454 return 0
2455
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002456 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2457 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002458 assert parsed_issue_arg.valid
2459
Edward Lemur125d60a2019-09-13 18:25:41 +00002460 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002461
2462 if parsed_issue_arg.hostname:
2463 self._gerrit_host = parsed_issue_arg.hostname
2464 self._gerrit_server = 'https://%s' % self._gerrit_host
2465
tandriic2405f52016-10-10 08:13:15 -07002466 try:
2467 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002468 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002469 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002470
2471 if not parsed_issue_arg.patchset:
2472 # Use current revision by default.
2473 revision_info = detail['revisions'][detail['current_revision']]
2474 patchset = int(revision_info['_number'])
2475 else:
2476 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002477 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002478 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2479 break
2480 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002481 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002482 (parsed_issue_arg.patchset, self.GetIssue()))
2483
Edward Lemur125d60a2019-09-13 18:25:41 +00002484 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002485 if remote_url.endswith('.git'):
2486 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002487 remote_url = remote_url.rstrip('/')
2488
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002489 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002490 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002491
2492 if remote_url != fetch_info['url']:
2493 DieWithError('Trying to patch a change from %s but this repo appears '
2494 'to be %s.' % (fetch_info['url'], remote_url))
2495
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002496 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002497
Joanna Wangc023a632023-01-26 17:59:25 +00002498 # Set issue immediately in case the cherry-pick fails, which happens
2499 # when resolving conflicts.
2500 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002501 self.SetIssue(parsed_issue_arg.issue)
2502
Aaron Gable62619a32017-06-16 08:22:09 -07002503 if force:
2504 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2505 print('Checked out commit for change %i patchset %i locally' %
2506 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002507 elif nocommit:
2508 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2509 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002510 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002511 RunGit(['cherry-pick', 'FETCH_HEAD'])
2512 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002513 (parsed_issue_arg.issue, patchset))
2514 print('Note: this created a local commit which does not have '
2515 'the same hash as the one uploaded for review. This will make '
2516 'uploading changes based on top of this branch difficult.\n'
2517 'If you want to do that, use "git cl patch --force" instead.')
2518
Stefan Zagerd08043c2017-10-12 12:07:02 -07002519 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002520 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002521 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002522 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2523 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002524 else:
2525 print('WARNING: You are in detached HEAD state.\n'
2526 'The patch has been applied to your checkout, but you will not be '
2527 'able to upload a new patch set to the gerrit issue.\n'
2528 'Try using the \'-b\' option if you would like to work on a '
2529 'branch and/or upload a new patch set.')
2530
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002531 return 0
2532
Joanna Wang18de1f62023-01-21 01:24:24 +00002533 @staticmethod
2534 def _GerritCommitMsgHookCheck(offer_removal):
2535 # type: (bool) -> None
2536 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002537 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2538 if not os.path.exists(hook):
2539 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002540 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2541 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002542 data = gclient_utils.FileRead(hook)
2543 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2544 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002545 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002546 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002547 'and may interfere with it in subtle ways.\n'
2548 'We recommend you remove the commit-msg hook.')
2549 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002550 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002551 gclient_utils.rm_file_or_tree(hook)
2552 print('Gerrit commit-msg hook removed.')
2553 else:
2554 print('OK, will keep Gerrit commit-msg hook in place.')
2555
Edward Lemur1b52d872019-05-09 21:12:12 +00002556 def _CleanUpOldTraces(self):
2557 """Keep only the last |MAX_TRACES| traces."""
2558 try:
2559 traces = sorted([
2560 os.path.join(TRACES_DIR, f)
2561 for f in os.listdir(TRACES_DIR)
2562 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2563 and not f.startswith('tmp'))
2564 ])
2565 traces_to_delete = traces[:-MAX_TRACES]
2566 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002567 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002568 except OSError:
2569 print('WARNING: Failed to remove old git traces from\n'
2570 ' %s'
2571 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002572
Edward Lemur5737f022019-05-17 01:24:00 +00002573 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002574 """Zip and write the git push traces stored in traces_dir."""
2575 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002576 traces_zip = trace_name + '-traces'
2577 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002578 # Create a temporary dir to store git config and gitcookies in. It will be
2579 # compressed and stored next to the traces.
2580 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002581 git_info_zip = trace_name + '-git-info'
2582
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002583 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002584
Edward Lemur1b52d872019-05-09 21:12:12 +00002585 git_push_metadata['trace_name'] = trace_name
2586 gclient_utils.FileWrite(
2587 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2588
2589 # Keep only the first 6 characters of the git hashes on the packet
2590 # trace. This greatly decreases size after compression.
2591 packet_traces = os.path.join(traces_dir, 'trace-packet')
2592 if os.path.isfile(packet_traces):
2593 contents = gclient_utils.FileRead(packet_traces)
2594 gclient_utils.FileWrite(
2595 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2596 shutil.make_archive(traces_zip, 'zip', traces_dir)
2597
2598 # Collect and compress the git config and gitcookies.
2599 git_config = RunGit(['config', '-l'])
2600 gclient_utils.FileWrite(
2601 os.path.join(git_info_dir, 'git-config'),
2602 git_config)
2603
2604 cookie_auth = gerrit_util.Authenticator.get()
2605 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2606 gitcookies_path = cookie_auth.get_gitcookies_path()
2607 if os.path.isfile(gitcookies_path):
2608 gitcookies = gclient_utils.FileRead(gitcookies_path)
2609 gclient_utils.FileWrite(
2610 os.path.join(git_info_dir, 'gitcookies'),
2611 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2612 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2613
Edward Lemur1b52d872019-05-09 21:12:12 +00002614 gclient_utils.rmtree(git_info_dir)
2615
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002616 def _RunGitPushWithTraces(self,
2617 refspec,
2618 refspec_opts,
2619 git_push_metadata,
2620 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002621 """Run git push and collect the traces resulting from the execution."""
2622 # Create a temporary directory to store traces in. Traces will be compressed
2623 # and stored in a 'traces' dir inside depot_tools.
2624 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002625 trace_name = os.path.join(
2626 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002627
2628 env = os.environ.copy()
2629 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2630 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002631 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002632 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2633 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2634 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2635
2636 try:
2637 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002638 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002639 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002640 push_cmd = ['git', 'push', remote_url, refspec]
2641 if git_push_options:
2642 for opt in git_push_options:
2643 push_cmd.extend(['-o', opt])
2644
Edward Lemur0f58ae42019-04-30 17:24:12 +00002645 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002646 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002647 env=env,
2648 print_stdout=True,
2649 # Flush after every line: useful for seeing progress when running as
2650 # recipe.
2651 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002652 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002653 except subprocess2.CalledProcessError as e:
2654 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002655 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002656 raise GitPushError(
2657 'Failed to create a change, very likely due to blocked keyword. '
2658 'Please examine output above for the reason of the failure.\n'
2659 'If this is a false positive, you can try to bypass blocked '
2660 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002661 '-o banned-words~skip, e.g.:\n'
2662 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002663 'If git-cl is not working correctly, file a bug under the '
2664 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002665 if 'git push -o nokeycheck' in str(e.stdout):
2666 raise GitPushError(
2667 'Failed to create a change, very likely due to a private key being '
2668 'detected. Please examine output above for the reason of the '
2669 'failure.\n'
2670 'If this is a false positive, you can try to bypass private key '
2671 'detection by using push option '
2672 '-o nokeycheck, e.g.:\n'
2673 'git cl upload -o nokeycheck\n\n'
2674 'If git-cl is not working correctly, file a bug under the '
2675 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002676
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002677 raise GitPushError(
2678 'Failed to create a change. Please examine output above for the '
2679 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002680 'For emergencies, Googlers can escalate to '
2681 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002682 'Hint: run command below to diagnose common Git/Gerrit '
2683 'credential problems:\n'
2684 ' git cl creds-check\n'
2685 '\n'
2686 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2687 'component including the files below.\n'
2688 'Review the files before upload, since they might contain sensitive '
2689 'information.\n'
2690 'Set the Restrict-View-Google label so that they are not publicly '
2691 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002692 finally:
2693 execution_time = time_time() - before_push
2694 metrics.collector.add_repeated('sub_commands', {
2695 'command': 'git push',
2696 'execution_time': execution_time,
2697 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002698 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002699 })
2700
Edward Lemur1b52d872019-05-09 21:12:12 +00002701 git_push_metadata['execution_time'] = execution_time
2702 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002703 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002704
Edward Lemur1b52d872019-05-09 21:12:12 +00002705 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002706 gclient_utils.rmtree(traces_dir)
2707
2708 return push_stdout
2709
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002710 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2711 change_desc):
2712 """Upload the current branch to Gerrit, retry if new remote HEAD is
2713 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002714 remote, remote_branch = self.GetRemoteBranch()
2715 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2716
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002717 try:
2718 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002719 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002720 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002721 # Repository might be in the middle of transition to main branch as
2722 # default, and uploads to old default might be blocked.
2723 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002724 DieWithError(str(e), change_desc)
2725
Josip Sokcevicb631a882021-01-06 18:18:10 +00002726 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2727 self.GetGerritProject())
2728 if project_head == branch:
2729 DieWithError(str(e), change_desc)
2730 branch = project_head
2731
2732 print("WARNING: Fetching remote state and retrying upload to default "
2733 "branch...")
2734 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002735 options.edit_description = False
2736 options.force = True
2737 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002738 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2739 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002740 except GitPushError as e:
2741 DieWithError(str(e), change_desc)
2742
2743 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002744 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002745 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002747 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002748 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002749 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002750 # User requested to change description
2751 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002752 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002753 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2754 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002755 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002756
2757 # Check if changes outside of this workspace have been uploaded.
2758 current_rev = change_detail['current_revision']
2759 last_uploaded_rev = self._GitGetBranchConfigValue(
2760 GERRIT_SQUASH_HASH_CONFIG_KEY)
2761 if last_uploaded_rev and current_rev != last_uploaded_rev:
2762 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002763 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002764 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002765 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002766 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002767 if len(change_ids) == 1:
2768 change_id = change_ids[0]
2769 else:
2770 change_id = GenerateGerritChangeId(change_desc.description)
2771 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002772
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002773 if options.preserve_tryjobs:
2774 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002775
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002777 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002778 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002779 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002780 with gclient_utils.temporary_file() as desc_tempfile:
2781 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2782 ref_to_push = RunGit(
2783 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002784 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002785 if options.no_add_changeid:
2786 pass
2787 else: # adding Change-Ids is okay.
2788 if not git_footers.get_footer_change_id(change_desc.description):
2789 DownloadGerritHook(False)
2790 change_desc.set_description(
2791 self._AddChangeIdToCommitMessage(change_desc.description,
2792 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002793 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002794 # For no-squash mode, we assume the remote called "origin" is the one we
2795 # want. It is not worthwhile to support different workflows for
2796 # no-squash mode.
2797 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002798 # attempt to extract the changeid from the current description
2799 # fail informatively if not possible.
2800 change_id_candidates = git_footers.get_footer_change_id(
2801 change_desc.description)
2802 if not change_id_candidates:
2803 DieWithError("Unable to extract change-id from message.")
2804 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002805
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002806 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002807 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2808 ref_to_push)]).splitlines()
2809 if len(commits) > 1:
2810 print('WARNING: This will upload %d commits. Run the following command '
2811 'to see which commits will be uploaded: ' % len(commits))
2812 print('git log %s..%s' % (parent, ref_to_push))
2813 print('You can also use `git squash-branch` to squash these into a '
2814 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002815 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002816
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002817 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002818 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002819 # Add default, watchlist, presubmit ccs if this is the initial upload
2820 # and CL is not private and auto-ccing has not been disabled.
2821 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002822 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002823 if len(cc) > 100:
2824 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2825 'process/lsc/lsc_workflow.md')
2826 print('WARNING: This will auto-CC %s users.' % len(cc))
2827 print('LSC may be more appropriate: %s' % lsc)
2828 print('You can also use the --no-autocc flag to disable auto-CC.')
2829 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002830 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002831 if options.cc:
2832 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002833 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002834 if change_desc.get_cced():
2835 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002836 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002837 valid_accounts = set(reviewers + cc)
2838 # TODO(crbug/877717): relax this for all hosts.
2839 else:
2840 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002841 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002842 logging.info('accounts %s are recognized, %s invalid',
2843 sorted(valid_accounts),
2844 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002845
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002846 # Extra options that can be specified at push time. Doc:
2847 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002848 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002849
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002850 for r in sorted(reviewers):
2851 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002852 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002853 reviewers.remove(r)
2854 else:
2855 # TODO(tandrii): this should probably be a hard failure.
2856 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2857 % r)
2858 for c in sorted(cc):
2859 # refspec option will be rejected if cc doesn't correspond to an
2860 # account, even though REST call to add such arbitrary cc may succeed.
2861 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002862 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002863 cc.remove(c)
2864
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002865 refspec_suffix = ''
2866 if refspec_opts:
2867 refspec_suffix = '%' + ','.join(refspec_opts)
2868 assert ' ' not in refspec_suffix, (
2869 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2870 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002871
Edward Lemur1b52d872019-05-09 21:12:12 +00002872 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002873 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002874 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002875 'change_id': change_id,
2876 'description': change_desc.description,
2877 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002878
Gavin Mak4e5e3992022-11-14 22:40:12 +00002879 # Gerrit may or may not update fast enough to return the correct patchset
2880 # number after we push. Get the pre-upload patchset and increment later.
2881 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2882
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002883 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002884 git_push_metadata,
2885 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886
2887 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002888 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002889 change_numbers = [m.group(1)
2890 for m in map(regex.match, push_stdout.splitlines())
2891 if m]
2892 if len(change_numbers) != 1:
2893 DieWithError(
2894 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002895 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002897 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002898 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002899
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002900 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002901 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002902 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002903 gerrit_util.AddReviewers(self.GetGerritHost(),
2904 self._GerritChangeIdentifier(),
2905 reviewers,
2906 cc,
2907 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002908
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002909 return 0
2910
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002911 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2912 change_desc):
2913 """Computes parent of the generated commit to be uploaded to Gerrit.
2914
2915 Returns revision or a ref name.
2916 """
2917 if custom_cl_base:
2918 # Try to avoid creating additional unintended CLs when uploading, unless
2919 # user wants to take this risk.
2920 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2921 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2922 local_ref_of_target_remote])
2923 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002924 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002925 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2926 'If you proceed with upload, more than 1 CL may be created by '
2927 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2928 'If you are certain that specified base `%s` has already been '
2929 'uploaded to Gerrit as another CL, you may proceed.\n' %
2930 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2931 if not force:
2932 confirm_or_exit(
2933 'Do you take responsibility for cleaning up potential mess '
2934 'resulting from proceeding with upload?',
2935 action='upload')
2936 return custom_cl_base
2937
Aaron Gablef97e33d2017-03-30 15:44:27 -07002938 if remote != '.':
2939 return self.GetCommonAncestorWithUpstream()
2940
2941 # If our upstream branch is local, we base our squashed commit on its
2942 # squashed version.
2943 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2944
Aaron Gablef97e33d2017-03-30 15:44:27 -07002945 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002946 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002947 if upstream_branch_name == 'main':
2948 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002949
2950 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002951 # TODO(tandrii): consider checking parent change in Gerrit and using its
2952 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2953 # the tree hash of the parent branch. The upside is less likely bogus
2954 # requests to reupload parent change just because it's uploadhash is
2955 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002956 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2957 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002958 # Verify that the upstream branch has been uploaded too, otherwise
2959 # Gerrit will create additional CLs when uploading.
2960 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2961 RunGitSilent(['rev-parse', parent + ':'])):
2962 DieWithError(
2963 '\nUpload upstream branch %s first.\n'
2964 'It is likely that this branch has been rebased since its last '
2965 'upload, so you just need to upload it again.\n'
2966 '(If you uploaded it with --no-squash, then branch dependencies '
2967 'are not supported, and you should reupload with --squash.)'
2968 % upstream_branch_name,
2969 change_desc)
2970 return parent
2971
Gavin Mak4e5e3992022-11-14 22:40:12 +00002972 def _UpdateWithExternalChanges(self):
2973 """Updates workspace with external changes.
2974
2975 Returns the commit hash that should be used as the merge base on upload.
2976 """
2977 local_ps = self.GetPatchset()
2978 if local_ps is None:
2979 return
2980
2981 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002982 if external_ps is None or local_ps == external_ps or \
2983 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002984 return
2985
2986 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002987 if num_changes > 1:
2988 change_words = 'changes were'
2989 else:
2990 change_words = 'change was'
2991 print('\n%d external %s published to %s:\n' %
2992 (num_changes, change_words, self.GetIssueURL(short=True)))
2993
2994 # Print an overview of external changes.
2995 ps_to_commit = {}
2996 ps_to_info = {}
2997 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2998 for commit_id, revision_info in revisions.get('revisions', {}).items():
2999 ps_num = revision_info['_number']
3000 ps_to_commit[ps_num] = commit_id
3001 ps_to_info[ps_num] = revision_info
3002
3003 for ps in range(external_ps, local_ps, -1):
3004 commit = ps_to_commit[ps][:8]
3005 desc = ps_to_info[ps].get('description', '')
3006 print('Patchset %d [%s] %s' % (ps, commit, desc))
3007
3008 if not ask_for_explicit_yes('\nUploading as-is will override them. '
3009 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00003010 return
3011
3012 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
3013 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
3014 external_base = external_parent['commit']
3015
3016 branch = git_common.current_branch()
3017 local_base = self.GetCommonAncestorWithUpstream()
3018 if local_base != external_base:
3019 print('\nLocal merge base %s is different from Gerrit %s.\n' %
3020 (local_base, external_base))
3021 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00003022 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
3023 'Continue with upload and override the latest changes?')
3024 return
3025 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00003026
3027 # Fetch Gerrit's CL base if it doesn't exist locally.
3028 remote, _ = self.GetRemoteBranch()
3029 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
3030 RunGitSilent(['fetch', remote, external_base])
3031
3032 # Get the diff between local_ps and external_ps.
3033 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003034 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003035 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3036 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3037 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3038 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3039 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3040
3041 # Diff can be empty in the case of trivial rebases.
3042 if not diff:
3043 return external_base
3044
3045 # Apply the diff.
3046 with gclient_utils.temporary_file() as diff_tempfile:
3047 gclient_utils.FileWrite(diff_tempfile, diff)
3048 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3049 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3050 if not clean_patch:
3051 # Normally patchset is set after upload. But because we exit, that never
3052 # happens. Updating here makes sure that subsequent uploads don't need
3053 # to fetch/apply the same diff again.
3054 self.SetPatchset(external_ps)
3055 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3056 'conflicts and reupload.')
3057
3058 message = 'Incorporate external changes from '
3059 if num_changes == 1:
3060 message += 'patchset %d' % external_ps
3061 else:
3062 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3063 RunGitSilent(['commit', '-am', message])
3064 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3065 # patchset title instead of this 'Incorporate' message.
3066 return external_base
3067
Edward Lemura12175c2020-03-09 16:58:26 +00003068 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003069 """Re-commits using the current message, assumes the commit hook is in
3070 place.
3071 """
Edward Lemura12175c2020-03-09 16:58:26 +00003072 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003073 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003074 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003075 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003076 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003077
3078 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003079
tandriie113dfd2016-10-11 10:20:12 -07003080 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003081 try:
3082 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003083 except GerritChangeNotExists:
3084 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003085
3086 if data['status'] in ('ABANDONED', 'MERGED'):
3087 return 'CL %s is closed' % self.GetIssue()
3088
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003089 def GetGerritChange(self, patchset=None):
3090 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003091 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003092 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003093 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003094 data = self._GetChangeDetail(['ALL_REVISIONS'])
3095
3096 assert host and issue and patchset, 'CL must be uploaded first'
3097
3098 has_patchset = any(
3099 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003100 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003101 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003102 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003103 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003104
tandrii8c5a3532016-11-04 07:52:02 -07003105 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003106 'host': host,
3107 'change': issue,
3108 'project': data['project'],
3109 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003110 }
tandriie113dfd2016-10-11 10:20:12 -07003111
tandriide281ae2016-10-12 06:02:30 -07003112 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003113 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003114
Edward Lemur707d70b2018-02-07 00:50:14 +01003115 def GetReviewers(self):
3116 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003117 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003118
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003119
Lei Zhang8a0efc12020-08-05 19:58:45 +00003120def _get_bug_line_values(default_project_prefix, bugs):
3121 """Given default_project_prefix and comma separated list of bugs, yields bug
3122 line values.
tandriif9aefb72016-07-01 09:06:51 -07003123
3124 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003125 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003126 * string, which is left as is.
3127
3128 This function may produce more than one line, because bugdroid expects one
3129 project per line.
3130
Lei Zhang8a0efc12020-08-05 19:58:45 +00003131 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003132 ['v8:123', 'chromium:789']
3133 """
3134 default_bugs = []
3135 others = []
3136 for bug in bugs.split(','):
3137 bug = bug.strip()
3138 if bug:
3139 try:
3140 default_bugs.append(int(bug))
3141 except ValueError:
3142 others.append(bug)
3143
3144 if default_bugs:
3145 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003146 if default_project_prefix:
3147 if not default_project_prefix.endswith(':'):
3148 default_project_prefix += ':'
3149 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003150 else:
3151 yield default_bugs
3152 for other in sorted(others):
3153 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3154 yield other
3155
3156
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003157class ChangeDescription(object):
3158 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003159 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003160 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003161 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003162 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003163 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003164 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3165 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003166 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003167 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003168
Dan Beamd8b04ca2019-10-10 21:23:26 +00003169 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003170 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003171 if bug:
3172 regexp = re.compile(self.BUG_LINE)
3173 prefix = settings.GetBugPrefix()
3174 if not any((regexp.match(line) for line in self._description_lines)):
3175 values = list(_get_bug_line_values(prefix, bug))
3176 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003177 if fixed:
3178 regexp = re.compile(self.FIXED_LINE)
3179 prefix = settings.GetBugPrefix()
3180 if not any((regexp.match(line) for line in self._description_lines)):
3181 values = list(_get_bug_line_values(prefix, fixed))
3182 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003183
agable@chromium.org42c20792013-09-12 17:34:49 +00003184 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003185 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003186 return '\n'.join(self._description_lines)
3187
3188 def set_description(self, desc):
3189 if isinstance(desc, basestring):
3190 lines = desc.splitlines()
3191 else:
3192 lines = [line.rstrip() for line in desc]
3193 while lines and not lines[0]:
3194 lines.pop(0)
3195 while lines and not lines[-1]:
3196 lines.pop(-1)
3197 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003198
Edward Lemur5a644f82020-03-18 16:44:57 +00003199 def ensure_change_id(self, change_id):
3200 description = self.description
3201 footer_change_ids = git_footers.get_footer_change_id(description)
3202 # Make sure that the Change-Id in the description matches the given one.
3203 if footer_change_ids != [change_id]:
3204 if footer_change_ids:
3205 # Remove any existing Change-Id footers since they don't match the
3206 # expected change_id footer.
3207 description = git_footers.remove_footer(description, 'Change-Id')
3208 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3209 'if you want to set a new one.')
3210 # Add the expected Change-Id footer.
3211 description = git_footers.add_footer_change_id(description, change_id)
3212 self.set_description(description)
3213
Joanna Wang39811b12023-01-20 23:09:48 +00003214 def update_reviewers(self, reviewers):
3215 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003216
3217 Args:
3218 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003219 """
Joanna Wang39811b12023-01-20 23:09:48 +00003220 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003221 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003222
3223 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003224
Joanna Wang39811b12023-01-20 23:09:48 +00003225 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003226 regexp = re.compile(self.R_LINE)
3227 matches = [regexp.match(line) for line in self._description_lines]
3228 new_desc = [l for i, l in enumerate(self._description_lines)
3229 if not matches[i]]
3230 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003231
Joanna Wang39811b12023-01-20 23:09:48 +00003232 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003233
Joanna Wang39811b12023-01-20 23:09:48 +00003234 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003235 for match in matches:
3236 if not match:
3237 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003238 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003239
Joanna Wang39811b12023-01-20 23:09:48 +00003240 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003241
3242 # Put the new lines in the description where the old first R= line was.
3243 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3244 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003245 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003246 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003247 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003248
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003249 def set_preserve_tryjobs(self):
3250 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3251 footers = git_footers.parse_footers(self.description)
3252 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3253 if v.lower() == 'true':
3254 return
3255 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3256
Anthony Polito8b955342019-09-24 19:01:36 +00003257 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003258 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 self.set_description([
3260 '# Enter a description of the change.',
3261 '# This will be displayed on the codereview site.',
3262 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003263 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003264 '--------------------',
3265 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003266 bug_regexp = re.compile(self.BUG_LINE)
3267 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003268 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003269 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003270
Dan Beamd8b04ca2019-10-10 21:23:26 +00003271 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003272 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003273
Bruce Dawsonfc487042020-10-27 19:11:37 +00003274 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003275 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003276 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003277 if not content:
3278 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003279 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003280
Bruce Dawson2377b012018-01-11 16:46:49 -08003281 # Strip off comments and default inserted "Bug:" line.
3282 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003283 (line.startswith('#') or
3284 line.rstrip() == "Bug:" or
3285 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003286 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003287 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003288 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003289
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003290 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003291 """Adds a footer line to the description.
3292
3293 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3294 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3295 that Gerrit footers are always at the end.
3296 """
3297 parsed_footer_line = git_footers.parse_footer(line)
3298 if parsed_footer_line:
3299 # Line is a gerrit footer in the form: Footer-Key: any value.
3300 # Thus, must be appended observing Gerrit footer rules.
3301 self.set_description(
3302 git_footers.add_footer(self.description,
3303 key=parsed_footer_line[0],
3304 value=parsed_footer_line[1]))
3305 return
3306
3307 if not self._description_lines:
3308 self._description_lines.append(line)
3309 return
3310
3311 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3312 if gerrit_footers:
3313 # git_footers.split_footers ensures that there is an empty line before
3314 # actual (gerrit) footers, if any. We have to keep it that way.
3315 assert top_lines and top_lines[-1] == ''
3316 top_lines, separator = top_lines[:-1], top_lines[-1:]
3317 else:
3318 separator = [] # No need for separator if there are no gerrit_footers.
3319
3320 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003321 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3322 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003323 top_lines.append('')
3324 top_lines.append(line)
3325 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003326
tandrii99a72f22016-08-17 14:33:24 -07003327 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003328 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003329 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003330 reviewers = [match.group(2).strip()
3331 for match in matches
3332 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003333 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003334
bradnelsond975b302016-10-23 12:20:23 -07003335 def get_cced(self):
3336 """Retrieves the list of reviewers."""
3337 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3338 cced = [match.group(2).strip() for match in matches if match]
3339 return cleanup_list(cced)
3340
Nodir Turakulov23b82142017-11-16 11:04:25 -08003341 def get_hash_tags(self):
3342 """Extracts and sanitizes a list of Gerrit hashtags."""
3343 subject = (self._description_lines or ('',))[0]
3344 subject = re.sub(
3345 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3346
3347 tags = []
3348 start = 0
3349 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3350 while True:
3351 m = bracket_exp.match(subject, start)
3352 if not m:
3353 break
3354 tags.append(self.sanitize_hash_tag(m.group(1)))
3355 start = m.end()
3356
3357 if not tags:
3358 # Try "Tag: " prefix.
3359 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3360 if m:
3361 tags.append(self.sanitize_hash_tag(m.group(1)))
3362 return tags
3363
3364 @classmethod
3365 def sanitize_hash_tag(cls, tag):
3366 """Returns a sanitized Gerrit hash tag.
3367
3368 A sanitized hashtag can be used as a git push refspec parameter value.
3369 """
3370 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3371
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003372
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003373def FindCodereviewSettingsFile(filename='codereview.settings'):
3374 """Finds the given file starting in the cwd and going up.
3375
3376 Only looks up to the top of the repository unless an
3377 'inherit-review-settings-ok' file exists in the root of the repository.
3378 """
3379 inherit_ok_file = 'inherit-review-settings-ok'
3380 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003381 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003382 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003383 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003384 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003385 if os.path.isfile(os.path.join(cwd, filename)):
3386 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003387 if cwd == root:
3388 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003389 parent_dir = os.path.dirname(cwd)
3390 if parent_dir == cwd:
3391 # We hit the system root directory.
3392 break
3393 cwd = parent_dir
3394 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003395
3396
3397def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003398 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003399 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003400
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003401 def SetProperty(name, setting, unset_error_ok=False):
3402 fullname = 'rietveld.' + name
3403 if setting in keyvals:
3404 RunGit(['config', fullname, keyvals[setting]])
3405 else:
3406 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3407
tandrii48df5812016-10-17 03:55:37 -07003408 if not keyvals.get('GERRIT_HOST', False):
3409 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003410 # Only server setting is required. Other settings can be absent.
3411 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003412 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003413 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3414 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003415 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003416 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3417 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003418 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3419 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003420 SetProperty(
3421 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
Dirk Pranke6f0df682021-06-25 00:42:33 +00003422 SetProperty('use-python3', 'USE_PYTHON3', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003423
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003424 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003425 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003426
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003427 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003428 RunGit(['config', 'gerrit.squash-uploads',
3429 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003430
tandrii@chromium.org28253532016-04-14 13:46:56 +00003431 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003432 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003433 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3434
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003436 # should be of the form
3437 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3438 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003439 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3440 keyvals['ORIGIN_URL_CONFIG']])
3441
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003442
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003443def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003444 """Downloads a network object to a local file, like urllib.urlretrieve.
3445
3446 This is necessary because urllib is broken for SSL connections via a proxy.
3447 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003448 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003449 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003450
3451
ukai@chromium.org712d6102013-11-27 00:52:58 +00003452def hasSheBang(fname):
3453 """Checks fname is a #! script."""
3454 with open(fname) as f:
3455 return f.read(2).startswith('#!')
3456
3457
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003458def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003459 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003460
3461 Args:
3462 force: True to update hooks. False to install hooks if not present.
3463 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003464 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003465 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3466 if not os.access(dst, os.X_OK):
3467 if os.path.exists(dst):
3468 if not force:
3469 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003470 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003471 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003472 if not hasSheBang(dst):
3473 DieWithError('Not a script: %s\n'
3474 'You need to download from\n%s\n'
3475 'into .git/hooks/commit-msg and '
3476 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003477 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3478 except Exception:
3479 if os.path.exists(dst):
3480 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003481 DieWithError('\nFailed to download hooks.\n'
3482 'You need to download from\n%s\n'
3483 'into .git/hooks/commit-msg and '
3484 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003485
3486
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003487class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003488 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003489
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003490 def __init__(self):
3491 # Cached list of [host, identity, source], where source is either
3492 # .gitcookies or .netrc.
3493 self._all_hosts = None
3494
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003495 def ensure_configured_gitcookies(self):
3496 """Runs checks and suggests fixes to make git use .gitcookies from default
3497 path."""
3498 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3499 configured_path = RunGitSilent(
3500 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003501 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003502 if configured_path:
3503 self._ensure_default_gitcookies_path(configured_path, default)
3504 else:
3505 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003507 @staticmethod
3508 def _ensure_default_gitcookies_path(configured_path, default_path):
3509 assert configured_path
3510 if configured_path == default_path:
3511 print('git is already configured to use your .gitcookies from %s' %
3512 configured_path)
3513 return
3514
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003515 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003516 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3517 (configured_path, default_path))
3518
3519 if not os.path.exists(configured_path):
3520 print('However, your configured .gitcookies file is missing.')
3521 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3522 action='reconfigure')
3523 RunGit(['config', '--global', 'http.cookiefile', default_path])
3524 return
3525
3526 if os.path.exists(default_path):
3527 print('WARNING: default .gitcookies file already exists %s' %
3528 default_path)
3529 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3530 default_path)
3531
3532 confirm_or_exit('Move existing .gitcookies to default location?',
3533 action='move')
3534 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003535 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003536 print('Moved and reconfigured git to use .gitcookies from %s' %
3537 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003538
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003539 @staticmethod
3540 def _configure_gitcookies_path(default_path):
3541 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3542 if os.path.exists(netrc_path):
3543 print('You seem to be using outdated .netrc for git credentials: %s' %
3544 netrc_path)
3545 print('This tool will guide you through setting up recommended '
3546 '.gitcookies store for git credentials.\n'
3547 '\n'
3548 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3549 ' git config --global --unset http.cookiefile\n'
3550 ' mv %s %s.backup\n\n' % (default_path, default_path))
3551 confirm_or_exit(action='setup .gitcookies')
3552 RunGit(['config', '--global', 'http.cookiefile', default_path])
3553 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003554
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003555 def get_hosts_with_creds(self, include_netrc=False):
3556 if self._all_hosts is None:
3557 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003558 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3559 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3560 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3561 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003562
3563 if include_netrc:
3564 return self._all_hosts
3565 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3566
3567 def print_current_creds(self, include_netrc=False):
3568 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3569 if not hosts:
3570 print('No Git/Gerrit credentials found')
3571 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003572 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003573 header = [('Host', 'User', 'Which file'),
3574 ['=' * l for l in lengths]]
3575 for row in (header + hosts):
3576 print('\t'.join((('%%+%ds' % l) % s)
3577 for l, s in zip(lengths, row)))
3578
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003579 @staticmethod
3580 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003581 """Parses identity "git-<username>.domain" into <username> and domain."""
3582 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003583 # distinguishable from sub-domains. But we do know typical domains:
3584 if identity.endswith('.chromium.org'):
3585 domain = 'chromium.org'
3586 username = identity[:-len('.chromium.org')]
3587 else:
3588 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003589 if username.startswith('git-'):
3590 username = username[len('git-'):]
3591 return username, domain
3592
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003593 def has_generic_host(self):
3594 """Returns whether generic .googlesource.com has been configured.
3595
3596 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3597 """
3598 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003599 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003600 return True
3601 return False
3602
3603 def _get_git_gerrit_identity_pairs(self):
3604 """Returns map from canonic host to pair of identities (Git, Gerrit).
3605
3606 One of identities might be None, meaning not configured.
3607 """
3608 host_to_identity_pairs = {}
3609 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003610 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003611 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3612 idx = 0 if canonical == host else 1
3613 pair[idx] = identity
3614 return host_to_identity_pairs
3615
3616 def get_partially_configured_hosts(self):
3617 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003618 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003619 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003620 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003621
3622 def get_conflicting_hosts(self):
3623 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003624 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003625 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003626 if None not in (i1, i2) and i1 != i2)
3627
3628 def get_duplicated_hosts(self):
3629 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003630 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003631
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003632
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003634 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003635 hosts = sorted(hosts)
3636 assert hosts
3637 if extra_column_func is None:
3638 extras = [''] * len(hosts)
3639 else:
3640 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003641 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3642 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003643 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003644 lines.append(tmpl % he)
3645 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003646
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003647 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003648 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003649 yield ('.googlesource.com wildcard record detected',
3650 ['Chrome Infrastructure team recommends to list full host names '
3651 'explicitly.'],
3652 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003653
3654 dups = self.get_duplicated_hosts()
3655 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003656 yield ('The following hosts were defined twice',
3657 self._format_hosts(dups),
3658 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003659
3660 partial = self.get_partially_configured_hosts()
3661 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003662 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3663 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003664 self._format_hosts(
3665 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3666 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003667
3668 conflicting = self.get_conflicting_hosts()
3669 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003670 yield ('The following Git hosts have differing credentials from their '
3671 'Gerrit counterparts',
3672 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3673 tuple(self._get_git_gerrit_identity_pairs()[host])),
3674 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003675
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003676 def find_and_report_problems(self):
3677 """Returns True if there was at least one problem, else False."""
3678 found = False
3679 bad_hosts = set()
3680 for title, sublines, hosts in self._find_problems():
3681 if not found:
3682 found = True
3683 print('\n\n.gitcookies problem report:\n')
3684 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003685 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003686 if sublines:
3687 print()
3688 print(' %s' % '\n '.join(sublines))
3689 print()
3690
3691 if bad_hosts:
3692 assert found
3693 print(' You can manually remove corresponding lines in your %s file and '
3694 'visit the following URLs with correct account to generate '
3695 'correct credential lines:\n' %
3696 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003697 print(' %s' % '\n '.join(
3698 sorted(
3699 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3700 _canonical_git_googlesource_host(host))
3701 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003702 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003703
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003704
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003705@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003706def CMDcreds_check(parser, args):
3707 """Checks credentials and suggests changes."""
3708 _, _ = parser.parse_args(args)
3709
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003710 # Code below checks .gitcookies. Abort if using something else.
3711 authn = gerrit_util.Authenticator.get()
3712 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003713 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003714 'This command is not designed for bot environment. It checks '
3715 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003716 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3717 if isinstance(authn, gerrit_util.GceAuthenticator):
3718 message += (
3719 '\n'
3720 'If you need to run this on GCE or a cloudtop instance, '
3721 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3722 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003723
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003724 checker = _GitCookiesChecker()
3725 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003726
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003727 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003728 checker.print_current_creds(include_netrc=True)
3729
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003730 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003731 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003732 return 0
3733 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003734
3735
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003736@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003737def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003738 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003739 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003740 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003741 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003742 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003743 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003744 return RunGit(['config', 'branch.%s.base-url' % branch],
3745 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003746
3747 print('Setting base-url to %s' % args[0])
3748 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3749 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003750
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003751
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003752def color_for_status(status):
3753 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003754 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003755 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003756 'unsent': BOLD + Fore.YELLOW,
3757 'waiting': BOLD + Fore.RED,
3758 'reply': BOLD + Fore.YELLOW,
3759 'not lgtm': BOLD + Fore.RED,
3760 'lgtm': BOLD + Fore.GREEN,
3761 'commit': BOLD + Fore.MAGENTA,
3762 'closed': BOLD + Fore.CYAN,
3763 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003764 }.get(status, Fore.WHITE)
3765
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003766
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003767def get_cl_statuses(changes, fine_grained, max_processes=None):
3768 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003769
3770 If fine_grained is true, this will fetch CL statuses from the server.
3771 Otherwise, simply indicate if there's a matching url for the given branches.
3772
3773 If max_processes is specified, it is used as the maximum number of processes
3774 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3775 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003776
3777 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003778 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003779 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003780 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003781
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003782 if not fine_grained:
3783 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003784 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003785 for cl in changes:
3786 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003787 return
3788
3789 # First, sort out authentication issues.
3790 logging.debug('ensuring credentials exist')
3791 for cl in changes:
3792 cl.EnsureAuthenticated(force=False, refresh=True)
3793
3794 def fetch(cl):
3795 try:
3796 return (cl, cl.GetStatus())
3797 except:
3798 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003799 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003800 raise
3801
3802 threads_count = len(changes)
3803 if max_processes:
3804 threads_count = max(1, min(threads_count, max_processes))
3805 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3806
Edward Lemur61bf4172020-02-24 23:22:37 +00003807 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003808 fetched_cls = set()
3809 try:
3810 it = pool.imap_unordered(fetch, changes).__iter__()
3811 while True:
3812 try:
3813 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003814 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003815 break
3816 fetched_cls.add(cl)
3817 yield cl, status
3818 finally:
3819 pool.close()
3820
3821 # Add any branches that failed to fetch.
3822 for cl in set(changes) - fetched_cls:
3823 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003824
rmistry@google.com2dd99862015-06-22 12:22:18 +00003825
Jose Lopes3863fc52020-04-07 17:00:25 +00003826def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003827 """Uploads CLs of local branches that are dependents of the current branch.
3828
3829 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003830
3831 test1 -> test2.1 -> test3.1
3832 -> test3.2
3833 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003834
3835 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3836 run on the dependent branches in this order:
3837 test2.1, test3.1, test3.2, test2.2, test3.3
3838
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003839 Note: This function does not rebase your local dependent branches. Use it
3840 when you make a change to the parent branch that will not conflict
3841 with its dependent branches, and you would like their dependencies
3842 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003843 """
3844 if git_common.is_dirty_git_tree('upload-branch-deps'):
3845 return 1
3846
3847 root_branch = cl.GetBranch()
3848 if root_branch is None:
3849 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3850 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003851 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003852 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3853 'patchset dependencies without an uploaded CL.')
3854
3855 branches = RunGit(['for-each-ref',
3856 '--format=%(refname:short) %(upstream:short)',
3857 'refs/heads'])
3858 if not branches:
3859 print('No local branches found.')
3860 return 0
3861
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003862 # Create a dictionary of all local branches to the branches that are
3863 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003864 tracked_to_dependents = collections.defaultdict(list)
3865 for b in branches.splitlines():
3866 tokens = b.split()
3867 if len(tokens) == 2:
3868 branch_name, tracked = tokens
3869 tracked_to_dependents[tracked].append(branch_name)
3870
vapiera7fbd5a2016-06-16 09:17:49 -07003871 print()
3872 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003874
rmistry@google.com2dd99862015-06-22 12:22:18 +00003875 def traverse_dependents_preorder(branch, padding=''):
3876 dependents_to_process = tracked_to_dependents.get(branch, [])
3877 padding += ' '
3878 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003879 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003880 dependents.append(dependent)
3881 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003882
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003885
3886 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003887 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003888 return 0
3889
rmistry@google.com2dd99862015-06-22 12:22:18 +00003890 # Record all dependents that failed to upload.
3891 failures = {}
3892 # Go through all dependents, checkout the branch and upload.
3893 try:
3894 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003895 print()
3896 print('--------------------------------------')
3897 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003898 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003899 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003900 try:
3901 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003903 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003904 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003905 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003906 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003907 finally:
3908 # Swap back to the original root branch.
3909 RunGit(['checkout', '-q', root_branch])
3910
vapiera7fbd5a2016-06-16 09:17:49 -07003911 print()
3912 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003913 for dependent_branch in dependents:
3914 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print(' %s : %s' % (dependent_branch, upload_status))
3916 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003917
3918 return 0
3919
3920
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003921def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003922 """Given a proposed tag name, returns a tag name that is guaranteed to be
3923 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3924 or 'foo-3', and so on."""
3925
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003926 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003927 for suffix_num in itertools.count(1):
3928 if suffix_num == 1:
3929 to_check = proposed_tag
3930 else:
3931 to_check = '%s-%d' % (proposed_tag, suffix_num)
3932
3933 if to_check not in existing_tags:
3934 return to_check
3935
3936
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003937@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003938def CMDarchive(parser, args):
3939 """Archives and deletes branches associated with closed changelists."""
3940 parser.add_option(
3941 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003942 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003943 parser.add_option(
3944 '-f', '--force', action='store_true',
3945 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003946 parser.add_option(
3947 '-d', '--dry-run', action='store_true',
3948 help='Skip the branch tagging and removal steps.')
3949 parser.add_option(
3950 '-t', '--notags', action='store_true',
3951 help='Do not tag archived branches. '
3952 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003953 parser.add_option(
3954 '-p',
3955 '--pattern',
3956 default='git-cl-archived-{issue}-{branch}',
3957 help='Format string for archive tags. '
3958 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003959
kmarshall3bff56b2016-06-06 18:31:47 -07003960 options, args = parser.parse_args(args)
3961 if args:
3962 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003963
3964 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3965 if not branches:
3966 return 0
3967
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003968 tags = RunGit(['for-each-ref', '--format=%(refname)',
3969 'refs/tags']).splitlines() or []
3970 tags = [t.split('/')[-1] for t in tags]
3971
vapiera7fbd5a2016-06-16 09:17:49 -07003972 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003973 changes = [Changelist(branchref=b)
3974 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003975 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3976 statuses = get_cl_statuses(changes,
3977 fine_grained=True,
3978 max_processes=options.maxjobs)
3979 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003980 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3981 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003982 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003983 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003984 proposal.sort()
3985
3986 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003987 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003988 return 0
3989
Edward Lemur85153282020-02-14 22:06:29 +00003990 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003991
vapiera7fbd5a2016-06-16 09:17:49 -07003992 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003993 if options.notags:
3994 for next_item in proposal:
3995 print(' ' + next_item[0])
3996 else:
3997 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3998 for next_item in proposal:
3999 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004000
kmarshall9249e012016-08-23 12:02:16 -07004001 # Quit now on precondition failure or if instructed by the user, either
4002 # via an interactive prompt or by command line flags.
4003 if options.dry_run:
4004 print('\nNo changes were made (dry run).\n')
4005 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004006
4007 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004008 print('You are currently on a branch \'%s\' which is associated with a '
4009 'closed codereview issue, so archive cannot proceed. Please '
4010 'checkout another branch and run this command again.' %
4011 current_branch)
4012 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004013
4014 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00004015 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07004016 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004017 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004018 return 1
4019
4020 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004021 if not options.notags:
4022 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00004023
4024 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
4025 # Clean up the tag if we failed to delete the branch.
4026 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07004027
vapiera7fbd5a2016-06-16 09:17:49 -07004028 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004029
4030 return 0
4031
4032
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004033@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004034def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004035 """Show status of changelists.
4036
4037 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004038 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004039 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004040 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004041 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004042 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004043 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004044 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004045
4046 Also see 'git cl comments'.
4047 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004048 parser.add_option(
4049 '--no-branch-color',
4050 action='store_true',
4051 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004052 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004053 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004054 parser.add_option('-f', '--fast', action='store_true',
4055 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004056 parser.add_option(
4057 '-j', '--maxjobs', action='store', type=int,
4058 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004059 parser.add_option(
4060 '-i', '--issue', type=int,
4061 help='Operate on this issue instead of the current branch\'s implicit '
4062 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004063 parser.add_option('-d',
4064 '--date-order',
4065 action='store_true',
4066 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004067 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004068 if args:
4069 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070
iannuccie53c9352016-08-17 14:40:40 -07004071 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004072 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004073
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004074 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004075 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004076 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004077 if cl.GetIssue():
4078 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004079 elif options.field == 'id':
4080 issueid = cl.GetIssue()
4081 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004083 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004084 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004085 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004086 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004087 elif options.field == 'status':
4088 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004089 elif options.field == 'url':
4090 url = cl.GetIssueURL()
4091 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004092 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004093 return 0
4094
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004095 branches = RunGit([
4096 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4097 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004098 if not branches:
4099 print('No local branch found.')
4100 return 0
4101
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004102 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004103 Changelist(branchref=b, commit_date=ct)
4104 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4105 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004106 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004107 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004108 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004109 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004110
Edward Lemur85153282020-02-14 22:06:29 +00004111 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004112
4113 def FormatBranchName(branch, colorize=False):
4114 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4115 an asterisk when it is the current branch."""
4116
4117 asterisk = ""
4118 color = Fore.RESET
4119 if branch == current_branch:
4120 asterisk = "* "
4121 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004122 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004123
4124 if colorize:
4125 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004126 return asterisk + branch_name
4127
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004128 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004129
4130 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004131
4132 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004133 sorted_changes = sorted(changes,
4134 key=lambda c: c.GetCommitDate(),
4135 reverse=True)
4136 else:
4137 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4138 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004139 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004140 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004141 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004142 branch_statuses[c.GetBranch()] = status
4143 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004144 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004145 if url and (not status or status == 'error'):
4146 # The issue probably doesn't exist anymore.
4147 url += ' (broken)'
4148
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004149 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004150 # Turn off bold as well as colors.
4151 END = '\033[0m'
4152 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004153 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004154 color = ''
4155 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004156 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004157
Alan Cuttera3be9a52019-03-04 18:50:33 +00004158 branch_display = FormatBranchName(branch)
4159 padding = ' ' * (alignment - len(branch_display))
4160 if not options.no_branch_color:
4161 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004162
Alan Cuttera3be9a52019-03-04 18:50:33 +00004163 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4164 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004165
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004167 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004168 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004169 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004170 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004171 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004172 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004173 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004174 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004175 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004177 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004178 return 0
4179
4180
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004181def colorize_CMDstatus_doc():
4182 """To be called once in main() to add colors to git cl status help."""
4183 colors = [i for i in dir(Fore) if i[0].isupper()]
4184
4185 def colorize_line(line):
4186 for color in colors:
4187 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004188 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004189 indent = len(line) - len(line.lstrip(' ')) + 1
4190 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4191 return line
4192
4193 lines = CMDstatus.__doc__.splitlines()
4194 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4195
4196
phajdan.jre328cf92016-08-22 04:12:17 -07004197def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004198 if path == '-':
4199 json.dump(contents, sys.stdout)
4200 else:
4201 with open(path, 'w') as f:
4202 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004203
4204
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004205@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004206@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004207def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004208 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004209
4210 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004211 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004212 parser.add_option('-r', '--reverse', action='store_true',
4213 help='Lookup the branch(es) for the specified issues. If '
4214 'no issues are specified, all branches with mapped '
4215 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004216 parser.add_option('--json',
4217 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004218 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219
dnj@chromium.org406c4402015-03-03 17:22:28 +00004220 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004221 branches = RunGit(['for-each-ref', 'refs/heads',
4222 '--format=%(refname)']).splitlines()
4223 # Reverse issue lookup.
4224 issue_branch_map = {}
4225
4226 git_config = {}
4227 for config in RunGit(['config', '--get-regexp',
4228 r'branch\..*issue']).splitlines():
4229 name, _space, val = config.partition(' ')
4230 git_config[name] = val
4231
4232 for branch in branches:
4233 issue = git_config.get(
4234 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4235 if issue:
4236 issue_branch_map.setdefault(int(issue), []).append(branch)
4237 if not args:
4238 args = sorted(issue_branch_map.keys())
4239 result = {}
4240 for issue in args:
4241 try:
4242 issue_num = int(issue)
4243 except ValueError:
4244 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4245 continue
4246 result[issue_num] = issue_branch_map.get(issue_num)
4247 print('Branch for issue number %s: %s' %
4248 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4249 if options.json:
4250 write_json(options.json, result)
4251 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004252
4253 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004254 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004255 if not issue.valid:
4256 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4257 'or no argument to list it.\n'
4258 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004259 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004260 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004261 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004262 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004263 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4264 if options.json:
4265 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004266 'gerrit_host': cl.GetGerritHost(),
4267 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004268 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004269 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004270 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004271 return 0
4272
4273
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004274@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004275def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 """Shows or posts review comments for any changelist."""
4277 parser.add_option('-a', '--add-comment', dest='comment',
4278 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004279 parser.add_option('-p', '--publish', action='store_true',
4280 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004281 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004282 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004283 parser.add_option('-m', '--machine-readable', dest='readable',
4284 action='store_false', default=True,
4285 help='output comments in a format compatible with '
4286 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004287 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004288 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004289 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004290
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004291 issue = None
4292 if options.issue:
4293 try:
4294 issue = int(options.issue)
4295 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004296 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004297
Edward Lemur934836a2019-09-09 20:16:54 +00004298 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004299
4300 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004301 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004302 return 0
4303
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004304 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4305 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004306 for comment in summary:
4307 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004308 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004309 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004310 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004311 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004312 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004313 elif comment.autogenerated:
4314 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004315 else:
4316 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004317 print('\n%s%s %s%s\n%s' % (
4318 color,
4319 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4320 comment.sender,
4321 Fore.RESET,
4322 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4323
smut@google.comc85ac942015-09-15 16:34:43 +00004324 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004325 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004326 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004327 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4328 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004329 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004330 return 0
4331
4332
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004333@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004334@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004335def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004336 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004337 parser.add_option('-d', '--display', action='store_true',
4338 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004339 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004340 help='New description to set for this issue (- for stdin, '
4341 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004342 parser.add_option('-f', '--force', action='store_true',
4343 help='Delete any unpublished Gerrit edits for this issue '
4344 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004345
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004346 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004347
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004348 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004349 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004350 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004351 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004352 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004353
Edward Lemur934836a2019-09-09 20:16:54 +00004354 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004355 if target_issue_arg:
4356 kwargs['issue'] = target_issue_arg.issue
4357 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004358
4359 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004360 if not cl.GetIssue():
4361 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004362
Edward Lemur678a6842019-10-03 22:25:05 +00004363 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004364 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004365
Edward Lemur6c6827c2020-02-06 21:15:18 +00004366 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004367
smut@google.com34fb6b12015-07-13 20:03:26 +00004368 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004370 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004371
4372 if options.new_description:
4373 text = options.new_description
4374 if text == '-':
4375 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004376 elif text == '+':
4377 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004378 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004379
4380 description.set_description(text)
4381 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004382 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004383 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004384 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004385 return 0
4386
4387
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004388@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004389def CMDlint(parser, args):
4390 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004391 parser.add_option('--filter', action='append', metavar='-x,+y',
4392 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004393 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004394
4395 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004396 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004397 try:
4398 import cpplint
4399 import cpplint_chromium
4400 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004401 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004402 return 1
4403
4404 # Change the current working directory before calling lint so that it
4405 # shows the correct base.
4406 previous_cwd = os.getcwd()
4407 os.chdir(settings.GetRoot())
4408 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004409 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004410 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004411 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004412 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004413 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004414
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004415 # Process cpplint arguments, if any.
4416 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4417 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004418 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004419
Lei Zhang379d1ad2020-07-15 19:40:06 +00004420 include_regex = re.compile(settings.GetLintRegex())
4421 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004422 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4423 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004424 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004425 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004426 continue
4427
4428 if ignore_regex.match(filename):
4429 print('Ignoring file %s' % filename)
4430 continue
4431
4432 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4433 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004434 finally:
4435 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004436 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004437 if cpplint._cpplint_state.error_count != 0:
4438 return 1
4439 return 0
4440
4441
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004442@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004443def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004444 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004445 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004446 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004447 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004448 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004449 parser.add_option('--all', action='store_true',
4450 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004451 parser.add_option('--files',
4452 nargs=1,
4453 help='Semicolon-separated list of files to be marked as '
4454 'modified when executing presubmit or post-upload hooks. '
4455 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004456 parser.add_option('--parallel', action='store_true',
4457 help='Run all tests specified by input_api.RunTests in all '
4458 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004459 parser.add_option('--resultdb', action='store_true',
4460 help='Run presubmit checks in the ResultSink environment '
4461 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004462 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004463 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004464
sbc@chromium.org71437c02015-04-09 19:29:40 +00004465 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004466 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004467 return 1
4468
Edward Lemur934836a2019-09-09 20:16:54 +00004469 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004470 if args:
4471 base_branch = args[0]
4472 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004473 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004474 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004476 start = time.time()
4477 try:
4478 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4479 description = cl.FetchDescription()
4480 else:
4481 description = _create_description_from_log([base_branch])
4482 except Exception as e:
4483 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004484 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004485 elapsed = time.time() - start
4486 if elapsed > 5:
4487 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004488
Bruce Dawson13acea32022-05-03 22:13:08 +00004489 if not base_branch:
4490 if not options.force:
4491 print('use --force to check even when not on a branch.')
4492 return 1
4493 base_branch = 'HEAD'
4494
Josip Sokcevic017544d2022-03-31 23:47:53 +00004495 cl.RunHook(committing=not options.upload,
4496 may_prompt=False,
4497 verbose=options.verbose,
4498 parallel=options.parallel,
4499 upstream=base_branch,
4500 description=description,
4501 all_files=options.all,
4502 files=options.files,
4503 resultdb=options.resultdb,
4504 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004505 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004506
4507
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004508def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004509 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004510
4511 Works the same way as
4512 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4513 but can be called on demand on all platforms.
4514
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004515 The basic idea is to generate git hash of a state of the tree, original
4516 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004517 """
4518 lines = []
4519 tree_hash = RunGitSilent(['write-tree'])
4520 lines.append('tree %s' % tree_hash.strip())
4521 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4522 if code == 0:
4523 lines.append('parent %s' % parent.strip())
4524 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4525 lines.append('author %s' % author.strip())
4526 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4527 lines.append('committer %s' % committer.strip())
4528 lines.append('')
4529 # Note: Gerrit's commit-hook actually cleans message of some lines and
4530 # whitespace. This code is not doing this, but it clearly won't decrease
4531 # entropy.
4532 lines.append(message)
4533 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004534 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004535 return 'I%s' % change_hash.strip()
4536
4537
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004538def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004539 """Computes the remote branch ref to use for the CL.
4540
4541 Args:
4542 remote (str): The git remote for the CL.
4543 remote_branch (str): The git remote branch for the CL.
4544 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004545 """
4546 if not (remote and remote_branch):
4547 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004548
wittman@chromium.org455dc922015-01-26 20:15:50 +00004549 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004550 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004551 # refs, which are then translated into the remote full symbolic refs
4552 # below.
4553 if '/' not in target_branch:
4554 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4555 else:
4556 prefix_replacements = (
4557 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4558 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4559 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4560 )
4561 match = None
4562 for regex, replacement in prefix_replacements:
4563 match = re.search(regex, target_branch)
4564 if match:
4565 remote_branch = target_branch.replace(match.group(0), replacement)
4566 break
4567 if not match:
4568 # This is a branch path but not one we recognize; use as-is.
4569 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004570 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004571 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004572 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004573 # Handle the refs that need to land in different refs.
4574 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004575
wittman@chromium.org455dc922015-01-26 20:15:50 +00004576 # Create the true path to the remote branch.
4577 # Does the following translation:
4578 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004579 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004580 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4581 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4582 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4583 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4584 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4585 'refs/heads/')
4586 elif remote_branch.startswith('refs/remotes/branch-heads'):
4587 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004588
wittman@chromium.org455dc922015-01-26 20:15:50 +00004589 return remote_branch
4590
4591
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004592def cleanup_list(l):
4593 """Fixes a list so that comma separated items are put as individual items.
4594
4595 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4596 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4597 """
4598 items = sum((i.split(',') for i in l), [])
4599 stripped_items = (i.strip() for i in items)
4600 return sorted(filter(None, stripped_items))
4601
4602
Aaron Gable4db38df2017-11-03 14:59:07 -07004603@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004604@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004605def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004606 """Uploads the current changelist to codereview.
4607
4608 Can skip dependency patchset uploads for a branch by running:
4609 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004610 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004611 git config --unset branch.branch_name.skip-deps-uploads
4612 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004613
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004614 If the name of the checked out branch starts with "bug-" or "fix-" followed
4615 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004616 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004617
4618 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004619 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004620 [git-cl] add support for hashtags
4621 Foo bar: implement foo
4622 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004623 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004624 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4625 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004626 parser.add_option('--bypass-watchlists', action='store_true',
4627 dest='bypass_watchlists',
4628 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004629 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004630 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004631 parser.add_option('--message', '-m', dest='message',
4632 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004633 parser.add_option('-b', '--bug',
4634 help='pre-populate the bug number(s) for this issue. '
4635 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004636 parser.add_option('--message-file', dest='message_file',
4637 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004638 parser.add_option('--title', '-t', dest='title',
4639 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004640 parser.add_option('-T', '--skip-title', action='store_true',
4641 dest='skip_title',
4642 help='Use the most recent commit message as the title of '
4643 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004644 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004645 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004646 help='reviewer email addresses')
4647 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004648 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004649 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004650 parser.add_option('--hashtag', dest='hashtags',
4651 action='append', default=[],
4652 help=('Gerrit hashtag for new CL; '
4653 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004654 parser.add_option('-s',
4655 '--send-mail',
4656 '--send-email',
4657 dest='send_mail',
4658 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004659 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004660 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004661 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004662 metavar='TARGET',
4663 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004664 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004665 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004666 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004667 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004668 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004669 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004670 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004671 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4672 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004673 parser.add_option('-c',
4674 '--use-commit-queue',
4675 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004676 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004677 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004678 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004679 parser.add_option('-d', '--cq-dry-run',
4680 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004681 help='Send the patchset to do a CQ dry run right after '
4682 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004683 parser.add_option(
4684 '-q',
4685 '--cq-quick-run',
4686 action='store_true',
4687 default=False,
4688 help='Send the patchset to do a CQ quick run right after '
4689 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4690 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004691 parser.add_option('--set-bot-commit', action='store_true',
4692 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004693 parser.add_option('--preserve-tryjobs', action='store_true',
4694 help='instruct the CQ to let tryjobs running even after '
4695 'new patchsets are uploaded instead of canceling '
4696 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004697 parser.add_option('--dependencies', action='store_true',
4698 help='Uploads CLs of all the local branches that depend on '
4699 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004700 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4701 help='Sends your change to the CQ after an approval. Only '
4702 'works on repos that have the Auto-Submit label '
4703 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004704 parser.add_option('--parallel', action='store_true',
4705 help='Run all tests specified by input_api.RunTests in all '
4706 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004707 parser.add_option('--no-autocc', action='store_true',
4708 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004709 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004710 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004711 parser.add_option('-R', '--retry-failed', action='store_true',
4712 help='Retry failed tryjobs from old patchset immediately '
4713 'after uploading new patchset. Cannot be used with '
4714 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004715 parser.add_option('--fixed', '-x',
4716 help='List of bugs that will be commented on and marked '
4717 'fixed (pre-populates "Fixed:" tag). Same format as '
4718 '-b option / "Bug:" tag. If fixing several issues, '
4719 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004720 parser.add_option('--edit-description', action='store_true', default=False,
4721 help='Modify description before upload. Cannot be used '
4722 'with --force. It is a noop when --no-squash is set '
4723 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004724 parser.add_option('--git-completion-helper', action="store_true",
4725 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004726 parser.add_option('-o',
4727 '--push-options',
4728 action='append',
4729 default=[],
4730 help='Transmit the given string to the server when '
4731 'performing git push (pass-through). See git-push '
4732 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004733 parser.add_option('--no-add-changeid',
4734 action='store_true',
4735 dest='no_add_changeid',
4736 help='Do not add change-ids to messages.')
Brian Sheedy7326ca22022-11-02 18:36:17 +00004737 parser.add_option('--no-python2-post-upload-hooks',
4738 action='store_true',
4739 help='Only run post-upload hooks in Python 3.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004740 parser.add_option('--cherry-pick-stacked',
4741 '--cp',
4742 dest='cherry_pick_stacked',
4743 action='store_true',
4744 help='If parent branch has un-uploaded updates, '
4745 'automatically skip parent branches and just upload '
4746 'the current branch cherry-pick on its parent\'s last '
4747 'uploaded commit. Allows users to skip the potential '
4748 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004749 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004750
rmistry@google.com2dd99862015-06-22 12:22:18 +00004751 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004752 (options, args) = parser.parse_args(args)
4753
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004754 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004755 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4756 if opt.help != optparse.SUPPRESS_HELP))
4757 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004758
sbc@chromium.org71437c02015-04-09 19:29:40 +00004759 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004760 return 1
4761
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004762 options.reviewers = cleanup_list(options.reviewers)
4763 options.cc = cleanup_list(options.cc)
4764
Josipe827b0f2020-01-30 00:07:20 +00004765 if options.edit_description and options.force:
4766 parser.error('Only one of --force and --edit-description allowed')
4767
tandriib80458a2016-06-23 12:20:07 -07004768 if options.message_file:
4769 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004770 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004771 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004772
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004773 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004774 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004775 options.use_commit_queue,
4776 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004777 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4778 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004779
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004780 if options.skip_title and options.title:
4781 parser.error('Only one of --title and --skip-title allowed.')
4782
Aaron Gableedbc4132017-09-11 13:22:28 -07004783 if options.use_commit_queue:
4784 options.send_mail = True
4785
Edward Lesmes0dd54822020-03-26 18:24:25 +00004786 if options.squash is None:
4787 # Load default for user, repo, squash=true, in this order.
4788 options.squash = settings.GetSquashGerritUploads()
4789
Joanna Wang5051ffe2023-03-01 22:24:07 +00004790 cl = Changelist(branchref=options.target_branch)
4791
4792 # Warm change details cache now to avoid RPCs later, reducing latency for
4793 # developers.
4794 if cl.GetIssue():
4795 cl._GetChangeDetail(
4796 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4797
4798 if options.retry_failed and not cl.GetIssue():
4799 print('No previous patchsets, so --retry-failed has no effect.')
4800 options.retry_failed = False
4801
Joanna Wangddd85782023-04-28 13:23:29 +00004802 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) != '0'
Joanna Wang5051ffe2023-03-01 22:24:07 +00004803
4804 if dogfood_stacked_changes:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004805 print(
4806 'This repo has been enrolled in the stacked changes dogfood.\n'
4807 '`git cl upload` now uploads the current branch and all upstream '
4808 'branches that have un-uploaded updates.\n'
4809 'Patches can now be reapplied with --force:\n'
4810 '`git cl patch --reapply --force`.\n'
4811 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
4812 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4813 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004814
Joanna Wangddd85782023-04-28 13:23:29 +00004815 if options.squash and dogfood_stacked_changes:
Brian Ryner8d19d862023-04-12 13:32:49 +00004816 print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4817 '"Set new changes to "work in progress" by default" checkbox at\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004818 'https://<host>-review.googlesource.com/settings/\n')
Joanna Wangdd12deb2023-01-26 20:43:28 +00004819 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004820 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004821
Joanna Wangd75fc882023-03-01 21:53:34 +00004822 if options.cherry_pick_stacked:
4823 try:
4824 orig_args.remove('--cherry-pick-stacked')
4825 except ValueError:
4826 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004827 UploadAllSquashed(options, orig_args)
4828 return 0
4829
Joanna Wangd75fc882023-03-01 21:53:34 +00004830 if options.cherry_pick_stacked:
4831 parser.error('--cherry-pick-stacked is not available for this workflow.')
4832
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004833 # cl.GetMostRecentPatchset uses cached information, and can return the last
4834 # patchset before upload. Calling it here makes it clear that it's the
4835 # last patchset before upload. Note that GetMostRecentPatchset will fail
4836 # if no CL has been uploaded yet.
4837 if options.retry_failed:
4838 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004839
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004840 ret = cl.CMDUpload(options, args, orig_args)
4841
4842 if options.retry_failed:
4843 if ret != 0:
4844 print('Upload failed, so --retry-failed has no effect.')
4845 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004846 builds, _ = _fetch_latest_builds(cl,
4847 DEFAULT_BUILDBUCKET_HOST,
4848 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004849 jobs = _filter_failed_for_retry(builds)
4850 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004851 print('No failed tryjobs, so --retry-failed has no effect.')
4852 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004853 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004854
4855 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004856
4857
Joanna Wang18de1f62023-01-21 01:24:24 +00004858def UploadAllSquashed(options, orig_args):
4859 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4860 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004861 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004862
Joanna Wangc710e2d2023-01-25 14:53:22 +00004863 # Create commits.
4864 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4865 if cherry_pick_current:
4866 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4867 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4868 uploads_by_cl.append((cls[0], new_upload))
4869 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004870 ordered_cls = list(reversed(cls))
4871
Joanna Wang6215dd02023-02-07 15:58:03 +00004872 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004873 # We can only support external changes when we're only uploading one
4874 # branch.
4875 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004876 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004877 if parent is None:
4878 origin = '.'
4879 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004880
Joanna Wang7603f042023-03-01 22:17:36 +00004881 while origin == '.':
4882 # Search for cl's closest ancestor with a gerrit hash.
4883 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4884 if origin == '.':
4885 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4886
4887 # Support the `git merge` and `git pull` workflow.
4888 if upstream_branch in ['master', 'main']:
4889 parent = cl.GetCommonAncestorWithUpstream()
4890 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004891 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4892 upstream_branch,
4893 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004894 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4895 upstream_branch,
4896 GERRIT_SQUASH_HASH_CONFIG_KEY)
4897 if parent:
4898 break
4899 branch = upstream_branch
4900 else:
4901 # Either the root of the tree is the cl's direct parent and the while
4902 # loop above only found empty branches between cl and the root of the
4903 # tree.
4904 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004905
Joanna Wang05b60342023-03-29 20:25:57 +00004906 if orig_parent is None:
4907 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004908 for i, cl in enumerate(ordered_cls):
4909 # If we're in the middle of the stack, set end_commit to downstream's
4910 # direct ancestor.
4911 if i + 1 < len(ordered_cls):
4912 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4913 else:
4914 child_base_commit = None
4915 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004916 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004917 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004918 end_commit=child_base_commit)
4919 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004920 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004921 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004922
4923 # Create refspec options
4924 cl, new_upload = uploads_by_cl[-1]
4925 refspec_opts = cl._GetRefSpecOptions(
4926 options,
4927 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004928 multi_change_upload=len(uploads_by_cl) > 1,
4929 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004930 refspec_suffix = ''
4931 if refspec_opts:
4932 refspec_suffix = '%' + ','.join(refspec_opts)
4933 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4934 refspec_suffix)
4935
4936 remote, remote_branch = cl.GetRemoteBranch()
4937 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4938 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4939 refspec_suffix)
4940
4941 # Git push
4942 git_push_metadata = {
4943 'gerrit_host':
4944 cl.GetGerritHost(),
4945 'title':
4946 options.title or '<untitled>',
4947 'change_id':
4948 git_footers.get_footer_change_id(new_upload.change_desc.description),
4949 'description':
4950 new_upload.change_desc.description,
4951 }
4952 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004953 git_push_metadata,
4954 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004955
4956 # Post push updates
4957 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4958 change_numbers = [
4959 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4960 ]
4961
4962 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4963 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4964
4965 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004966
4967
4968def _UploadAllPrecheck(options, orig_args):
4969 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4970 """Checks the state of the tree and gives the user uploading options
4971
4972 Returns: A tuple of the ordered list of changes that have new commits
4973 since their last upload and a boolean of whether the user wants to
4974 cherry-pick and upload the current branch instead of uploading all cls.
4975 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004976 cl = Changelist()
4977 if cl.GetBranch() is None:
4978 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4979
Joanna Wang18de1f62023-01-21 01:24:24 +00004980 branch_ref = None
4981 cls = []
4982 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004983 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004984
4985 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4986
4987 while True:
4988 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4989 DieWithError(
4990 'More than %s branches in the stack have not been uploaded.\n'
4991 'Are your branches in a misconfigured state?\n'
4992 'If not, please upload some upstream changes first.' %
4993 (_MAX_STACKED_BRANCHES_UPLOAD))
4994
4995 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004996
Joanna Wang6215dd02023-02-07 15:58:03 +00004997 # Only add CL if it has anything to commit.
4998 base_commit = cl.GetCommonAncestorWithUpstream()
4999 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
5000
5001 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
5002 if diff:
5003 cls.append(cl)
5004 if (not first_pass and
5005 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
5006 # We are mid-stack and the user must upload their upstream branches.
5007 must_upload_upstream = True
5008 elif first_pass: # The current branch has nothing to commit. Exit.
5009 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
5010 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
5011 first_pass = False
5012
5013 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00005014 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00005015 branch_ref = upstream_branch_ref # set branch for next run.
5016
Joanna Wang6215dd02023-02-07 15:58:03 +00005017 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
5018 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
5019 upstream_branch,
5020 LAST_UPLOAD_HASH_CONFIG_KEY)
5021
Joanna Wang18de1f62023-01-21 01:24:24 +00005022 # Case 1: We've reached the beginning of the tree.
5023 if origin != '.':
5024 break
5025
Joanna Wang18de1f62023-01-21 01:24:24 +00005026 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00005027 # the user MUST upload them unless they are empty. Continue to
5028 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00005029 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00005030 continue
5031
Joanna Wang18de1f62023-01-21 01:24:24 +00005032 # Case 3: If upstream's last_upload == cl.base_commit we do
5033 # not need to upload any more upstreams from this point on.
5034 # (Even if there may be diverged branches higher up the tree)
5035 if base_commit == upstream_last_upload:
5036 break
5037
5038 # Case 4: If upstream's last_upload < cl.base_commit we are
5039 # uploading cl and upstream_cl.
5040 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005041 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005042 continue
5043
5044 # Case 5: If cl.base_commit < upstream's last_upload the user
5045 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005046 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005047 DieWithError(
5048 'At least one branch in the stack has diverged from its upstream '
5049 'branch and does not contain its upstream\'s last upload.\n'
5050 'Please rebase the stack with `git rebase-update` before uploading.')
5051
5052 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5053 # any relation to commits in the tree. Continue up the tree until we hit
5054 # the root.
5055
5056 # We assume all cls in the stack have the same auth requirements and only
5057 # check this once.
5058 cls[0].EnsureAuthenticated(force=options.force)
5059
5060 cherry_pick = False
5061 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005062 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005063 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005064 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005065 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005066 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005067 msg = ('At least one parent branch in `%s` has never been uploaded '
5068 'and must be uploaded before/with `%s`.\n' %
5069 (branches, cls[1].branch))
5070 if options.cherry_pick_stacked:
5071 DieWithError(msg)
5072 if not options.force:
5073 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005074 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005075 if options.cherry_pick_stacked:
5076 print('cherry-picking `%s` on %s\'s last upload' %
5077 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005078 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005079 elif not options.force:
5080 answer = gclient_utils.AskForData(
5081 '\n' + opt_message +
5082 'Press enter to update branches %s.\nOr type `n` to upload only '
5083 '`%s` cherry-picked on %s\'s last upload:' %
5084 (branches, cls[0].branch, cls[1].branch))
5085 if answer.lower() == 'n':
5086 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005087 return cls, cherry_pick
5088
5089
Francois Dorayd42c6812017-05-30 15:10:20 -04005090@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005091@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005092def CMDsplit(parser, args):
5093 """Splits a branch into smaller branches and uploads CLs.
5094
5095 Creates a branch and uploads a CL for each group of files modified in the
5096 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005097 comment, the string '$directory', is replaced with the directory containing
5098 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005099 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005100 parser.add_option('-d', '--description', dest='description_file',
5101 help='A text file containing a CL description in which '
5102 '$directory will be replaced by each CL\'s directory.')
5103 parser.add_option('-c', '--comment', dest='comment_file',
5104 help='A text file containing a CL comment.')
5105 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005106 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005107 help='List the files and reviewers for each CL that would '
5108 'be created, but don\'t create branches or CLs.')
5109 parser.add_option('--cq-dry-run', action='store_true',
5110 help='If set, will do a cq dry run for each uploaded CL. '
5111 'Please be careful when doing this; more than ~10 CLs '
5112 'has the potential to overload our build '
5113 'infrastructure. Try to upload these not during high '
5114 'load times (usually 11-3 Mountain View time). Email '
5115 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005116 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5117 default=True,
5118 help='Sends your change to the CQ after an approval. Only '
5119 'works on repos that have the Auto-Submit label '
5120 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005121 parser.add_option('--max-depth',
5122 type='int',
5123 default=0,
5124 help='The max depth to look for OWNERS files. Useful for '
5125 'controlling the granularity of the split CLs, e.g. '
5126 '--max-depth=1 will only split by top-level '
5127 'directory. Specifying a value less than 1 means no '
5128 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005129 options, _ = parser.parse_args(args)
5130
5131 if not options.description_file:
5132 parser.error('No --description flag specified.')
5133
5134 def WrappedCMDupload(args):
5135 return CMDupload(OptionParser(), args)
5136
Daniel Cheng403c44e2022-10-05 22:24:58 +00005137 return split_cl.SplitCl(options.description_file, options.comment_file,
5138 Changelist, WrappedCMDupload, options.dry_run,
5139 options.cq_dry_run, options.enable_auto_submit,
5140 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005141
5142
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005143@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005144@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005145def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005146 """DEPRECATED: Used to commit the current changelist via git-svn."""
5147 message = ('git-cl no longer supports committing to SVN repositories via '
5148 'git-svn. You probably want to use `git cl land` instead.')
5149 print(message)
5150 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005151
5152
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005153@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005154@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005155def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005156 """Commits the current changelist via git.
5157
5158 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5159 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005160 """
5161 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5162 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005163 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005164 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005165 parser.add_option('--parallel', action='store_true',
5166 help='Run all tests specified by input_api.RunTests in all '
5167 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005168 parser.add_option('--resultdb', action='store_true',
5169 help='Run presubmit checks in the ResultSink environment '
5170 'and send results to the ResultDB database.')
5171 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173
Edward Lemur934836a2019-09-09 20:16:54 +00005174 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005175
Robert Iannucci2e73d432018-03-14 01:10:47 -07005176 if not cl.GetIssue():
5177 DieWithError('You must upload the change first to Gerrit.\n'
5178 ' If you would rather have `git cl land` upload '
5179 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005180 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5181 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005182
5183
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005184@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005185@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005186def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005187 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005188 parser.add_option('-b', dest='newbranch',
5189 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005190 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005191 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005193 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005194
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005195 group = optparse.OptionGroup(
5196 parser,
5197 'Options for continuing work on the current issue uploaded from a '
5198 'different clone (e.g. different machine). Must be used independently '
5199 'from the other options. No issue number should be specified, and the '
5200 'branch must have an issue number associated with it')
5201 group.add_option('--reapply', action='store_true', dest='reapply',
5202 help='Reset the branch and reapply the issue.\n'
5203 'CAUTION: This will undo any local changes in this '
5204 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005205
5206 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005207 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005208 parser.add_option_group(group)
5209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005210 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005211
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005212 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005213 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005214 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005216 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005217
Edward Lemur934836a2019-09-09 20:16:54 +00005218 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005219 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005220 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005221
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005222 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005223 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005224 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005225
5226 RunGit(['reset', '--hard', upstream])
5227 if options.pull:
5228 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005229
Edward Lemur678a6842019-10-03 22:25:05 +00005230 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005231 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5232 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005233
5234 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005235 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005236
Edward Lemurf38bc172019-09-03 21:02:13 +00005237 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005238 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005239 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005240
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005241 # We don't want uncommitted changes mixed up with the patch.
5242 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005243 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005244
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005245 if options.newbranch:
5246 if options.force:
5247 RunGit(['branch', '-D', options.newbranch],
5248 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005249 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005250
Edward Lemur678a6842019-10-03 22:25:05 +00005251 cl = Changelist(
5252 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005253
Edward Lemur678a6842019-10-03 22:25:05 +00005254 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005255 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005256
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005257 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5258 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005259
5260
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005261def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005262 """Fetches the tree status and returns either 'open', 'closed',
5263 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005264 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005266 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005267 if status.find('closed') != -1 or status == '0':
5268 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005269
5270 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005272
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005273 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005274 return 'unset'
5275
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005276
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005277def GetTreeStatusReason():
5278 """Fetches the tree status from a json url and returns the message
5279 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005280 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005281 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005282 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 status = json.loads(connection.read())
5284 connection.close()
5285 return status['message']
5286
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005287
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005288@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005290 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005291 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005292 status = GetTreeStatus()
5293 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005294 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005295 return 2
5296
vapiera7fbd5a2016-06-16 09:17:49 -07005297 print('The tree is %s' % status)
5298 print()
5299 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005300 if status != 'open':
5301 return 1
5302 return 0
5303
5304
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005305@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005306def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005307 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5308 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005309 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005310 '-b', '--bot', action='append',
5311 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5312 'times to specify multiple builders. ex: '
5313 '"-b win_rel -b win_layout". See '
5314 'the try server waterfall for the builders name and the tests '
5315 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005316 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005317 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005318 help=('Buildbucket bucket to send the try requests. Format: '
5319 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005320 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005321 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005322 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005323 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005324 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005325 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005326 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005327 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005328 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005329 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005330 '-q',
5331 '--quick-run',
5332 action='store_true',
5333 default=False,
5334 help='trigger in quick run mode '
5335 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5336 'uick_run.md) (chromium only).')
5337 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005338 '--category', default='git_cl_try', help='Specify custom build category.')
5339 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005340 '--project',
5341 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005342 'in recipe to determine to which repository or directory to '
5343 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005344 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005345 '-p', '--property', dest='properties', action='append', default=[],
5346 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005347 'key2=value2 etc. The value will be treated as '
5348 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005349 'NOTE: using this may make your tryjob not usable for CQ, '
5350 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005351 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005352 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5353 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005354 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005355 parser.add_option(
5356 '-R', '--retry-failed', action='store_true', default=False,
5357 help='Retry failed jobs from the latest set of tryjobs. '
5358 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005359 parser.add_option(
5360 '-i', '--issue', type=int,
5361 help='Operate on this issue instead of the current branch\'s implicit '
5362 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005363 options, args = parser.parse_args(args)
5364
machenbach@chromium.org45453142015-09-15 08:45:22 +00005365 # Make sure that all properties are prop=value pairs.
5366 bad_params = [x for x in options.properties if '=' not in x]
5367 if bad_params:
5368 parser.error('Got properties with missing "=": %s' % bad_params)
5369
maruel@chromium.org15192402012-09-06 12:38:29 +00005370 if args:
5371 parser.error('Unknown arguments: %s' % args)
5372
Edward Lemur934836a2019-09-09 20:16:54 +00005373 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005374 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005375 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005376
Edward Lemurf38bc172019-09-03 21:02:13 +00005377 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005378 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005379
tandriie113dfd2016-10-11 10:20:12 -07005380 error_message = cl.CannotTriggerTryJobReason()
5381 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005382 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005383
Edward Lemur45768512020-03-02 19:03:14 +00005384 if options.bot:
5385 if options.retry_failed:
5386 parser.error('--bot is not compatible with --retry-failed.')
5387 if not options.bucket:
5388 parser.error('A bucket (e.g. "chromium/try") is required.')
5389
5390 triggered = [b for b in options.bot if 'triggered' in b]
5391 if triggered:
5392 parser.error(
5393 'Cannot schedule builds on triggered bots: %s.\n'
5394 'This type of bot requires an initial job from a parent (usually a '
5395 'builder). Schedule a job on the parent instead.\n' % triggered)
5396
5397 if options.bucket.startswith('.master'):
5398 parser.error('Buildbot masters are not supported.')
5399
5400 project, bucket = _parse_bucket(options.bucket)
5401 if project is None or bucket is None:
5402 parser.error('Invalid bucket: %s.' % options.bucket)
5403 jobs = sorted((project, bucket, bot) for bot in options.bot)
5404 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005405 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005406 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005407 if options.verbose:
5408 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005409 jobs = _filter_failed_for_retry(builds)
5410 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005411 print('There are no failed jobs in the latest set of jobs '
5412 '(patchset #%d), doing nothing.' % patchset)
5413 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005414 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005415 if num_builders > 10:
5416 confirm_or_exit('There are %d builders with failed builds.'
5417 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005418 elif options.quick_run:
5419 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5420 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005421 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005422 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005423 print('git cl try with no bots now defaults to CQ dry run.')
5424 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5425 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005426
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005427 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005428 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005429 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005430 except BuildbucketResponseException as ex:
5431 print('ERROR: %s' % ex)
5432 return 1
5433 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005434
5435
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005436@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005437def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005438 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005439 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005440 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005441 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005442 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005443 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005444 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005445 '--color', action='store_true', default=setup_color.IS_TTY,
5446 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005448 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5449 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005450 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005451 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005452 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005453 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005454 parser.add_option(
5455 '-i', '--issue', type=int,
5456 help='Operate on this issue instead of the current branch\'s implicit '
5457 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005458 options, args = parser.parse_args(args)
5459 if args:
5460 parser.error('Unrecognized args: %s' % ' '.join(args))
5461
Edward Lemur934836a2019-09-09 20:16:54 +00005462 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005463 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005464 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005465
tandrii221ab252016-10-06 08:12:04 -07005466 patchset = options.patchset
5467 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005468 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005469 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005470 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005471 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005472 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005473 cl.GetIssue())
5474
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005476 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005477 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005478 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005479 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005480 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005481 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005482 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005483 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005484 return 0
5485
5486
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005487@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005488@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005489def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005490 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005491 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005492 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005493 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005494
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005495 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005496 if args:
5497 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005498 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005499 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005500 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005501 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005502
5503 # Clear configured merge-base, if there is one.
5504 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005505 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005506 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005507 return 0
5508
5509
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005510@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005511def CMDweb(parser, args):
5512 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005513 parser.add_option('-p',
5514 '--print-only',
5515 action='store_true',
5516 dest='print_only',
5517 help='Only print the Gerrit URL, don\'t open it in the '
5518 'browser.')
5519 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005520 if args:
5521 parser.error('Unrecognized args: %s' % ' '.join(args))
5522
5523 issue_url = Changelist().GetIssueURL()
5524 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005525 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005526 return 1
5527
Orr Bernstein0b960582022-12-22 20:16:18 +00005528 if options.print_only:
5529 print(issue_url)
5530 return 0
5531
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005532 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005533 # allows us to hide the "Created new window in existing browser session."
5534 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005535 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005536 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005537 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005538 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005539 os.open(os.devnull, os.O_RDWR)
5540 try:
5541 webbrowser.open(issue_url)
5542 finally:
5543 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005544 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005545 return 0
5546
5547
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005548@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005549def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005550 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005551 parser.add_option('-d', '--dry-run', action='store_true',
5552 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005553 parser.add_option(
5554 '-q',
5555 '--quick-run',
5556 action='store_true',
5557 help='trigger in quick run mode '
5558 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5559 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005560 parser.add_option('-c', '--clear', action='store_true',
5561 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005562 parser.add_option(
5563 '-i', '--issue', type=int,
5564 help='Operate on this issue instead of the current branch\'s implicit '
5565 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005566 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005567 if args:
5568 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005569 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5570 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005571
Edward Lemur934836a2019-09-09 20:16:54 +00005572 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005573 if not cl.GetIssue():
5574 parser.error('Must upload the issue first.')
5575
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005576 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005577 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005578 elif options.quick_run:
5579 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005580 elif options.dry_run:
5581 state = _CQState.DRY_RUN
5582 else:
5583 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005584 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005585 return 0
5586
5587
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005588@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005589def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005590 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005591 parser.add_option(
5592 '-i', '--issue', type=int,
5593 help='Operate on this issue instead of the current branch\'s implicit '
5594 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005595 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005596 if args:
5597 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005598 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005599 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005600 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005601 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005602 cl.CloseIssue()
5603 return 0
5604
5605
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005606@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005607def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005608 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005609 parser.add_option(
5610 '--stat',
5611 action='store_true',
5612 dest='stat',
5613 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005614 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005615 if args:
5616 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005617
Edward Lemur934836a2019-09-09 20:16:54 +00005618 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005619 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005620 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005621 if not issue:
5622 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005623
Gavin Makbe2e9262022-11-08 23:41:55 +00005624 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005625 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005626 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005627 if not base:
5628 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5629 revision_info = detail['revisions'][detail['current_revision']]
5630 fetch_info = revision_info['fetch']['http']
5631 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5632 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005633
Aaron Gablea718c3e2017-08-28 17:47:28 -07005634 cmd = ['git', 'diff']
5635 if options.stat:
5636 cmd.append('--stat')
5637 cmd.append(base)
5638 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005639
5640 return 0
5641
5642
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005643@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005644def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005645 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005646 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005647 '--ignore-current',
5648 action='store_true',
5649 help='Ignore the CL\'s current reviewers and start from scratch.')
5650 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005651 '--ignore-self',
5652 action='store_true',
5653 help='Do not consider CL\'s author as an owners.')
5654 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005655 '--no-color',
5656 action='store_true',
5657 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005658 parser.add_option(
5659 '--batch',
5660 action='store_true',
5661 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005662 # TODO: Consider moving this to another command, since other
5663 # git-cl owners commands deal with owners for a given CL.
5664 parser.add_option(
5665 '--show-all',
5666 action='store_true',
5667 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005668 options, args = parser.parse_args(args)
5669
Edward Lemur934836a2019-09-09 20:16:54 +00005670 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005671 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005672
Yang Guo6e269a02019-06-26 11:17:02 +00005673 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005674 if len(args) == 0:
5675 print('No files specified for --show-all. Nothing to do.')
5676 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005677 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005678 for path in args:
5679 print('Owners for %s:' % path)
5680 print('\n'.join(
5681 ' - %s' % owner
5682 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005683 return 0
5684
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005685 if args:
5686 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005687 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005688 base_branch = args[0]
5689 else:
5690 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005691 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005692
Edward Lemur2c62b332020-03-12 22:12:33 +00005693 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005694
5695 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005696 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5697 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005698 return 0
5699
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005700 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005701 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005702 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005703 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005704 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005705 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005706 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005707
5708
Aiden Bennerc08566e2018-10-03 17:52:42 +00005709def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005710 """Generates a diff command."""
5711 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005712 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5713
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005714 if allow_prefix:
5715 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5716 # case that diff.noprefix is set in the user's git config.
5717 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5718 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005719 diff_cmd += ['--no-prefix']
5720
5721 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005722
5723 if args:
5724 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005725 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005726 diff_cmd.append(arg)
5727 else:
5728 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005729
5730 return diff_cmd
5731
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005732
Jamie Madill5e96ad12020-01-13 16:08:35 +00005733def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5734 """Runs clang-format-diff and sets a return value if necessary."""
5735
5736 if not clang_diff_files:
5737 return 0
5738
5739 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5740 # formatted. This is used to block during the presubmit.
5741 return_value = 0
5742
5743 # Locate the clang-format binary in the checkout
5744 try:
5745 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5746 except clang_format.NotFoundError as e:
5747 DieWithError(e)
5748
5749 if opts.full or settings.GetFormatFullByDefault():
5750 cmd = [clang_format_tool]
5751 if not opts.dry_run and not opts.diff:
5752 cmd.append('-i')
5753 if opts.dry_run:
5754 for diff_file in clang_diff_files:
5755 with open(diff_file, 'r') as myfile:
5756 code = myfile.read().replace('\r\n', '\n')
5757 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5758 stdout = stdout.replace('\r\n', '\n')
5759 if opts.diff:
5760 sys.stdout.write(stdout)
5761 if code != stdout:
5762 return_value = 2
5763 else:
5764 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5765 if opts.diff:
5766 sys.stdout.write(stdout)
5767 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005768 try:
5769 script = clang_format.FindClangFormatScriptInChromiumTree(
5770 'clang-format-diff.py')
5771 except clang_format.NotFoundError as e:
5772 DieWithError(e)
5773
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005774 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005775 if not opts.dry_run and not opts.diff:
5776 cmd.append('-i')
5777
5778 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005779 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005780
Edward Lesmes89624cd2020-04-06 17:51:56 +00005781 env = os.environ.copy()
5782 env['PATH'] = (
5783 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5784 stdout = RunCommand(
5785 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005786 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005787 if opts.diff:
5788 sys.stdout.write(stdout)
5789 if opts.dry_run and len(stdout) > 0:
5790 return_value = 2
5791
5792 return return_value
5793
5794
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005795def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5796 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5797 presubmit checks have failed (and returns 0 otherwise)."""
5798
5799 if not rust_diff_files:
5800 return 0
5801
5802 # Locate the rustfmt binary.
5803 try:
5804 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5805 except rustfmt.NotFoundError as e:
5806 DieWithError(e)
5807
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005808 # TODO(crbug.com/1440869): Support formatting only the changed lines
5809 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005810 cmd = [rustfmt_tool]
5811 if opts.dry_run:
5812 cmd.append('--check')
5813 cmd += rust_diff_files
5814 rustfmt_exitcode = subprocess2.call(cmd)
5815
5816 if opts.presubmit and rustfmt_exitcode != 0:
5817 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005818
5819 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005820
5821
Olivier Robin0a6b5442022-04-07 07:25:04 +00005822def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5823 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5824 that presubmit checks have failed (and returns 0 otherwise)."""
5825
5826 if not swift_diff_files:
5827 return 0
5828
5829 # Locate the swift-format binary.
5830 try:
5831 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5832 except swift_format.NotFoundError as e:
5833 DieWithError(e)
5834
5835 cmd = [swift_format_tool]
5836 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005837 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005838 else:
5839 cmd += ['format', '-i']
5840 cmd += swift_diff_files
5841 swift_format_exitcode = subprocess2.call(cmd)
5842
5843 if opts.presubmit and swift_format_exitcode != 0:
5844 return 2
5845
5846 return 0
5847
5848
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005849def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005850 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005851 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005852
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005853
enne@chromium.org555cfe42014-01-29 18:21:39 +00005854@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005855@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005856def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005857 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005858 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005859 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005860 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005861 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005862 parser.add_option('--full', action='store_true',
5863 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005864 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005865 parser.add_option('--dry-run', action='store_true',
5866 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005867 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005868 '--no-clang-format',
5869 dest='clang_format',
5870 action='store_false',
5871 default=True,
5872 help='Disables formatting of various file types using clang-format.')
5873 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005874 '--python',
5875 action='store_true',
5876 default=None,
5877 help='Enables python formatting on all python files.')
5878 parser.add_option(
5879 '--no-python',
5880 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005881 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005882 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005883 'If neither --python or --no-python are set, python files that have a '
5884 '.style.yapf file in an ancestor directory will be formatted. '
5885 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005886 parser.add_option(
5887 '--js',
5888 action='store_true',
5889 help='Format javascript code with clang-format. '
5890 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005891 parser.add_option('--diff', action='store_true',
5892 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005893 parser.add_option('--presubmit', action='store_true',
5894 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005895
5896 parser.add_option('--rust-fmt',
5897 dest='use_rust_fmt',
5898 action='store_true',
5899 default=rustfmt.IsRustfmtSupported(),
5900 help='Enables formatting of Rust file types using rustfmt.')
5901 parser.add_option(
5902 '--no-rust-fmt',
5903 dest='use_rust_fmt',
5904 action='store_false',
5905 help='Disables formatting of Rust file types using rustfmt.')
5906
Olivier Robin0a6b5442022-04-07 07:25:04 +00005907 parser.add_option(
5908 '--swift-format',
5909 dest='use_swift_format',
5910 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005911 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005912 help='Enables formatting of Swift file types using swift-format '
5913 '(macOS host only).')
5914 parser.add_option(
5915 '--no-swift-format',
5916 dest='use_swift_format',
5917 action='store_false',
5918 help='Disables formatting of Swift file types using swift-format.')
5919
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005920 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005921
Garrett Beaty91a6f332020-01-06 16:57:24 +00005922 if opts.python is not None and opts.no_python:
5923 raise parser.error('Cannot set both --python and --no-python')
5924 if opts.no_python:
5925 opts.python = False
5926
Daniel Chengc55eecf2016-12-30 03:11:02 -08005927 # Normalize any remaining args against the current path, so paths relative to
5928 # the current directory are still resolved as expected.
5929 args = [os.path.join(os.getcwd(), arg) for arg in args]
5930
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005931 # git diff generates paths against the root of the repository. Change
5932 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005933 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005934 if rel_base_path:
5935 os.chdir(rel_base_path)
5936
digit@chromium.org29e47272013-05-17 17:01:46 +00005937 # Grab the merge-base commit, i.e. the upstream commit of the current
5938 # branch when it was created or the last time it was rebased. This is
5939 # to cover the case where the user may have called "git fetch origin",
5940 # moving the origin branch to a newer commit, but hasn't rebased yet.
5941 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005942 upstream_branch = opts.upstream
5943 if not upstream_branch:
5944 cl = Changelist()
5945 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005946 if upstream_branch:
5947 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5948 upstream_commit = upstream_commit.strip()
5949
5950 if not upstream_commit:
5951 DieWithError('Could not find base commit for this branch. '
5952 'Are you in detached state?')
5953
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005954 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5955 diff_output = RunGit(changed_files_cmd)
5956 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005957 # Filter out files deleted by this CL
5958 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005959
Andreas Haas417d89c2020-02-06 10:24:27 +00005960 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005961 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005962
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005963 clang_diff_files = []
5964 if opts.clang_format:
5965 clang_diff_files = [
5966 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5967 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005968 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005969 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005970 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005971 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005972
Edward Lesmes50da7702020-03-30 19:23:43 +00005973 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005974
Jamie Madill5e96ad12020-01-13 16:08:35 +00005975 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5976 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005977
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005978 if opts.use_rust_fmt:
5979 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5980 upstream_commit)
5981 if rust_fmt_return_value == 2:
5982 return_value = 2
5983
Olivier Robin0a6b5442022-04-07 07:25:04 +00005984 if opts.use_swift_format:
5985 if sys.platform != 'darwin':
5986 DieWithError('swift-format is only supported on macOS.')
5987 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5988 upstream_commit)
5989 if swift_format_return_value == 2:
5990 return_value = 2
5991
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005992 # Similar code to above, but using yapf on .py files rather than clang-format
5993 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005994 py_explicitly_disabled = opts.python is not None and not opts.python
5995 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005996 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5997 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005998
Aiden Bennerc08566e2018-10-03 17:52:42 +00005999 # Used for caching.
6000 yapf_configs = {}
6001 for f in python_diff_files:
6002 # Find the yapf style config for the current file, defaults to depot
6003 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006004 _FindYapfConfigFile(f, yapf_configs, top_dir)
6005
6006 # Turn on python formatting by default if a yapf config is specified.
6007 # This breaks in the case of this repo though since the specified
6008 # style file is also the global default.
6009 if opts.python is None:
6010 filtered_py_files = []
6011 for f in python_diff_files:
6012 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
6013 filtered_py_files.append(f)
6014 else:
6015 filtered_py_files = python_diff_files
6016
6017 # Note: yapf still seems to fix indentation of the entire file
6018 # even if line ranges are specified.
6019 # See https://github.com/google/yapf/issues/499
6020 if not opts.full and filtered_py_files:
6021 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
6022
Brian Sheedyb4307d52019-12-02 19:18:17 +00006023 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
6024 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
6025 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00006026
Aiden Benner99b0ccb2018-11-20 19:53:31 +00006027 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00006028 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
6029 # Default to pep8 if not .style.yapf is found.
6030 if not yapf_style:
6031 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00006032
Peter Wend9399922020-06-17 17:33:49 +00006033 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006034 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00006035 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00006036 else:
6037 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006038
6039 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006040
6041 has_formattable_lines = False
6042 if not opts.full:
6043 # Only run yapf over changed line ranges.
6044 for diff_start, diff_len in py_line_diffs[f]:
6045 diff_end = diff_start + diff_len - 1
6046 # Yapf errors out if diff_end < diff_start but this
6047 # is a valid line range diff for a removal.
6048 if diff_end >= diff_start:
6049 has_formattable_lines = True
6050 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6051 # If all line diffs were removals we have nothing to format.
6052 if not has_formattable_lines:
6053 continue
6054
6055 if opts.diff or opts.dry_run:
6056 cmd += ['--diff']
6057 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006058 stdout = RunCommand(cmd,
6059 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006060 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006061 cwd=top_dir,
6062 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006063 if opts.diff:
6064 sys.stdout.write(stdout)
6065 elif len(stdout) > 0:
6066 return_value = 2
6067 else:
6068 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006069 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006070
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006071 # Format GN build files. Always run on full build files for canonical form.
6072 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006073 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006074 if opts.dry_run or opts.diff:
6075 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006076 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006077 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006078 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006079 cwd=top_dir)
6080 if opts.dry_run and gn_ret == 2:
6081 return_value = 2 # Not formatted.
6082 elif opts.diff and gn_ret == 2:
6083 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006084 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006085 elif gn_ret != 0:
6086 # For non-dry run cases (and non-2 return values for dry-run), a
6087 # nonzero error code indicates a failure, probably because the file
6088 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006089 DieWithError('gn format failed on ' + gn_diff_file +
6090 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006091
Ilya Shermane081cbe2017-08-15 17:51:04 -07006092 # Skip the metrics formatting from the global presubmit hook. These files have
6093 # a separate presubmit hook that issues an error if the files need formatting,
6094 # whereas the top-level presubmit script merely issues a warning. Formatting
6095 # these files is somewhat slow, so it's important not to duplicate the work.
6096 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006097 for diff_xml in GetDiffXMLs(diff_files):
6098 xml_dir = GetMetricsDir(diff_xml)
6099 if not xml_dir:
6100 continue
6101
Ilya Shermane081cbe2017-08-15 17:51:04 -07006102 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006103 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006104 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006105
6106 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6107 # command as histograms/pretty_print.py now needs a relative path argument
6108 # after splitting the histograms into multiple directories.
6109 # For example, in tools/metrics/ukm, pretty-print could be run using:
6110 # $ python pretty_print.py
6111 # But in tools/metrics/histogrmas, pretty-print should be run with an
6112 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006113 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006114 # $ python pretty_print.py enums.xml
6115
Weilun Shib92c4b72020-08-27 17:45:11 +00006116 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006117 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006118 cmd.append(diff_xml)
6119
Ilya Shermane081cbe2017-08-15 17:51:04 -07006120 if opts.dry_run or opts.diff:
6121 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006122
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006123 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6124 # `shell` param and instead replace `'vpython'` with
6125 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006126 stdout = RunCommand(cmd,
6127 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006128 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006129 if opts.diff:
6130 sys.stdout.write(stdout)
6131 if opts.dry_run and stdout:
6132 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006133
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006134 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006135
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006136
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006137def GetDiffXMLs(diff_files):
6138 return [
6139 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6140 ]
6141
6142
6143def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006144 metrics_xml_dirs = [
6145 os.path.join('tools', 'metrics', 'actions'),
6146 os.path.join('tools', 'metrics', 'histograms'),
6147 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006148 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006149 os.path.join('tools', 'metrics', 'ukm'),
6150 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006151 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006152 if diff_xml.startswith(xml_dir):
6153 return xml_dir
6154 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006155
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006156
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006157@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006158@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006159def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006160 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006161 _, args = parser.parse_args(args)
6162
6163 if len(args) != 1:
6164 parser.print_help()
6165 return 1
6166
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006167 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006168 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006169 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006170
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006171 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006172
Edward Lemur52969c92020-02-06 18:15:28 +00006173 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006174 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006175 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006176
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006177 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006178 for key, issue in [x.split() for x in output.splitlines()]:
6179 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006180 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006181
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006182 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006183 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006184 return 1
6185 if len(branches) == 1:
6186 RunGit(['checkout', branches[0]])
6187 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006188 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006189 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006190 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006191 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006192 try:
6193 RunGit(['checkout', branches[int(which)]])
6194 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006195 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006196 return 1
6197
6198 return 0
6199
6200
maruel@chromium.org29404b52014-09-08 22:58:00 +00006201def CMDlol(parser, args):
6202 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006203 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006204 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6205 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6206 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006207 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006208 return 0
6209
6210
Josip Sokcevic0399e172022-03-21 23:11:51 +00006211def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006212 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006213 print(utils.depot_tools_version())
6214
6215
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006216class OptionParser(optparse.OptionParser):
6217 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006218
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006219 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006220 optparse.OptionParser.__init__(
6221 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006222 self.add_option(
6223 '-v', '--verbose', action='count', default=0,
6224 help='Use 2 times for more debugging info')
6225
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006226 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006227 try:
6228 return self._parse_args(args)
6229 finally:
6230 # Regardless of success or failure of args parsing, we want to report
6231 # metrics, but only after logging has been initialized (if parsing
6232 # succeeded).
6233 global settings
6234 settings = Settings()
6235
Edward Lesmes9c349062021-05-06 20:02:39 +00006236 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006237 try:
6238 # GetViewVCUrl ultimately calls logging method.
6239 project_url = settings.GetViewVCUrl().strip('/+')
6240 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6241 metrics.collector.add('project_urls', [project_url])
6242 except subprocess2.CalledProcessError:
6243 # Occurs when command is not executed in a git repository
6244 # We should not fail here. If the command needs to be executed
6245 # in a repo, it will be raised later.
6246 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006247
6248 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006249 # Create an optparse.Values object that will store only the actual passed
6250 # options, without the defaults.
6251 actual_options = optparse.Values()
6252 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6253 # Create an optparse.Values object with the default options.
6254 options = optparse.Values(self.get_default_values().__dict__)
6255 # Update it with the options passed by the user.
6256 options._update_careful(actual_options.__dict__)
6257 # Store the options passed by the user in an _actual_options attribute.
6258 # We store only the keys, and not the values, since the values can contain
6259 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006260 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006261
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006262 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006263 logging.basicConfig(
6264 level=levels[min(options.verbose, len(levels) - 1)],
6265 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6266 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006267
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006268 return options, args
6269
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006270
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006271def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006272 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006273 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006274 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006275 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006276
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006277 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006278 dispatcher = subcommand.CommandDispatcher(__name__)
6279 try:
6280 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006281 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006282 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006283 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006284 if e.code != 500:
6285 raise
6286 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006287 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006288 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006289 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006290
6291
6292if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006293 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6294 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006295 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006296 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006297 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006298 sys.exit(main(sys.argv[1:]))