blob: b97ed255e2de2984c31b3dd5e0fd5b293f9f8fb3 [file] [log] [blame]
Josip Sokcevic4de5dea2022-03-23 21:15:14 +00001#!/usr/bin/env vpython3
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010014import datetime
Brian Sheedyb4307d52019-12-02 19:18:17 +000015import fnmatch
Edward Lemur202c5592019-10-21 22:44:52 +000016import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010017import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000018import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000020import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import optparse
22import os
23import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010024import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000025import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000026import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070027import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000029import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000034from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000035import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000036import clang_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000037import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000038import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000039import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000040import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000041import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000042import git_new_branch
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000043import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000044import metrics_utils
Edward Lesmeseeca9c62020-11-20 00:00:17 +000045import owners_client
iannucci@chromium.org9e849272014-04-04 00:31:55 +000046import owners_finder
Lei Zhangb8c62cf2020-07-15 20:09:37 +000047import presubmit_canned_checks
Josip Sokcevic7958e302023-03-01 23:02:21 +000048import presubmit_support
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +000049import rustfmt
Josip Sokcevic7958e302023-03-01 23:02:21 +000050import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
Olivier Robin0a6b5442022-04-07 07:25:04 +000055import swift_format
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
Edward Lemur79d4f992019-11-11 23:49:02 +000058from third_party import six
59from six.moves import urllib
60
61
62if sys.version_info.major == 3:
63 basestring = (str,) # pylint: disable=redefined-builtin
64
Edward Lemurb9830242019-10-30 22:19:20 +000065
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
Edward Lemur0f58ae42019-04-30 17:24:12 +000068# Traces for git push will be stored in a traces directory inside the
69# depot_tools checkout.
70DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
71TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
Edward Lemur227d5102020-02-25 23:45:35 +000072PRESUBMIT_SUPPORT = os.path.join(DEPOT_TOOLS, 'presubmit_support.py')
Edward Lemur0f58ae42019-04-30 17:24:12 +000073
74# When collecting traces, Git hashes will be reduced to 6 characters to reduce
75# the size after compression.
76GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
77# Used to redact the cookies from the gitcookies file.
78GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
79
Edward Lemurd4d1ba42019-09-20 21:46:37 +000080MAX_ATTEMPTS = 3
81
Edward Lemur1b52d872019-05-09 21:12:12 +000082# The maximum number of traces we will keep. Multiplied by 3 since we store
83# 3 files per trace.
84MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000085# Message to be displayed to the user to inform where to find the traces for a
86# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000087TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000088'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000090' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000091'Copies of your gitcookies file and git config have been recorded at:\n'
92' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000093# Format of the message to be stored as part of the traces to give developers a
94# better context when they go through traces.
95TRACES_README_FORMAT = (
96'Date: %(now)s\n'
97'\n'
98'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
99'Title: %(title)s\n'
100'\n'
101'%(description)s\n'
102'\n'
103'Execution time: %(execution_time)s\n'
104'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800106POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000107DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000108REFS_THAT_ALIAS_TO_OTHER_REFS = {
Josip Sokcevic7e133ff2021-07-13 17:44:53 +0000109 'refs/remotes/origin/lkgr': 'refs/remotes/origin/main',
110 'refs/remotes/origin/lkcr': 'refs/remotes/origin/main',
rmistry@google.comc68112d2015-03-03 12:48:06 +0000111}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000113DEFAULT_OLD_BRANCH = 'refs/remotes/origin/master'
114DEFAULT_NEW_BRANCH = 'refs/remotes/origin/main'
115
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000116DEFAULT_BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
117
thestig@chromium.org44202a22014-03-11 19:22:18 +0000118# Valid extensions for files we want to lint.
119DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
120DEFAULT_LINT_IGNORE_REGEX = r"$^"
121
Aiden Bennerc08566e2018-10-03 17:52:42 +0000122# File name for yapf style config files.
123YAPF_CONFIG_FILENAME = '.style.yapf'
124
Edward Lesmes50da7702020-03-30 19:23:43 +0000125# The issue, patchset and codereview server are stored on git config for each
126# branch under branch.<branch-name>.<config-key>.
127ISSUE_CONFIG_KEY = 'gerritissue'
128PATCHSET_CONFIG_KEY = 'gerritpatchset'
129CODEREVIEW_SERVER_CONFIG_KEY = 'gerritserver'
Gavin Makbe2e9262022-11-08 23:41:55 +0000130# When using squash workflow, _CMDUploadChange doesn't simply push the commit(s)
131# you make to Gerrit. Instead, it creates a new commit object that contains all
132# changes you've made, diffed against a parent/merge base.
133# This is the hash of the new squashed commit and you can find this on Gerrit.
134GERRIT_SQUASH_HASH_CONFIG_KEY = 'gerritsquashhash'
135# This is the latest uploaded local commit hash.
136LAST_UPLOAD_HASH_CONFIG_KEY = 'last-upload-hash'
Edward Lesmes50da7702020-03-30 19:23:43 +0000137
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000138# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000139Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000140
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000141# Initialized in main()
142settings = None
143
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100144# Used by tests/git_cl_test.py to add extra logging.
145# Inside the weirdly failing test, add this:
146# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700147# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100148_IS_BEING_TESTED = False
149
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000150_GOOGLESOURCE = 'googlesource.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000151
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000152_KNOWN_GERRIT_TO_SHORT_URLS = {
153 'https://chrome-internal-review.googlesource.com': 'https://crrev.com/i',
154 'https://chromium-review.googlesource.com': 'https://crrev.com/c',
155}
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000156assert len(_KNOWN_GERRIT_TO_SHORT_URLS) == len(
157 set(_KNOWN_GERRIT_TO_SHORT_URLS.values())), 'must have unique values'
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000158
159
Joanna Wang18de1f62023-01-21 01:24:24 +0000160# Maximum number of branches in a stack that can be traversed and uploaded
161# at once. Picked arbitrarily.
162_MAX_STACKED_BRANCHES_UPLOAD = 20
163
164
Joanna Wang892f2ce2023-03-14 21:39:47 +0000165# Environment variable to indicate if user is participating in the stcked
166# changes dogfood.
167DOGFOOD_STACKED_CHANGES_VAR = 'DOGFOOD_STACKED_CHANGES'
168
169
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000170class GitPushError(Exception):
171 pass
172
173
Christopher Lamf732cd52017-01-24 12:40:11 +1100174def DieWithError(message, change_desc=None):
175 if change_desc:
176 SaveDescriptionBackup(change_desc)
Josip Sokcevic953278a2020-02-28 19:46:36 +0000177 print('\n ** Content of CL description **\n' +
178 '='*72 + '\n' +
179 change_desc.description + '\n' +
180 '='*72 + '\n')
Christopher Lamf732cd52017-01-24 12:40:11 +1100181
vapiera7fbd5a2016-06-16 09:17:49 -0700182 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183 sys.exit(1)
184
185
Christopher Lamf732cd52017-01-24 12:40:11 +1100186def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000187 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000188 print('\nsaving CL description to %s\n' % backup_path)
sokcevic07152802021-08-18 00:06:34 +0000189 with open(backup_path, 'wb') as backup_file:
190 backup_file.write(change_desc.description.encode('utf-8'))
Christopher Lamf732cd52017-01-24 12:40:11 +1100191
192
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000193def GetNoGitPagerEnv():
194 env = os.environ.copy()
195 # 'cat' is a magical git string that disables pagers on all platforms.
196 env['GIT_PAGER'] = 'cat'
197 return env
198
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000199
bsep@chromium.org627d9002016-04-29 00:00:52 +0000200def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000201 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000202 stdout = subprocess2.check_output(args, shell=shell, **kwargs)
203 return stdout.decode('utf-8', 'replace')
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000204 except subprocess2.CalledProcessError as e:
205 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000206 if not error_ok:
Alan Cutter594fd332020-07-21 23:55:27 +0000207 message = error_message or e.stdout.decode('utf-8', 'replace') or ''
208 DieWithError('Command "%s" failed.\n%s' % (' '.join(args), message))
Josip Sokcevic673e8ed2021-10-27 23:46:18 +0000209 out = e.stdout.decode('utf-8', 'replace')
210 if e.stderr:
211 out += e.stderr.decode('utf-8', 'replace')
212 return out
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000213
214
215def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000216 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000218
219
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000220def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000221 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700222 if suppress_stderr:
Edward Lesmescf06cad2020-12-14 22:03:23 +0000223 stderr = subprocess2.DEVNULL
tandrii5d48c322016-08-18 16:19:37 -0700224 else:
225 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000226 try:
tandrii5d48c322016-08-18 16:19:37 -0700227 (out, _), code = subprocess2.communicate(['git'] + args,
228 env=GetNoGitPagerEnv(),
229 stdout=subprocess2.PIPE,
230 stderr=stderr)
Edward Lemur79d4f992019-11-11 23:49:02 +0000231 return code, out.decode('utf-8', 'replace')
tandrii5d48c322016-08-18 16:19:37 -0700232 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900233 logging.debug('Failed running %s', ['git'] + args)
Edward Lemur79d4f992019-11-11 23:49:02 +0000234 return e.returncode, e.stdout.decode('utf-8', 'replace')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000235
236
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000237def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000238 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000239 return RunGitWithCode(args, suppress_stderr=True)[1]
240
241
tandrii2a16b952016-10-19 07:09:44 -0700242def time_sleep(seconds):
243 # Use this so that it can be mocked in tests without interfering with python
244 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700245 return time.sleep(seconds)
246
247
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000248def time_time():
249 # Use this so that it can be mocked in tests without interfering with python
250 # system machinery.
251 return time.time()
252
253
Edward Lemur1b52d872019-05-09 21:12:12 +0000254def datetime_now():
255 # Use this so that it can be mocked in tests without interfering with python
256 # system machinery.
257 return datetime.datetime.now()
258
259
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100260def confirm_or_exit(prefix='', action='confirm'):
261 """Asks user to press enter to continue or press Ctrl+C to abort."""
262 if not prefix or prefix.endswith('\n'):
263 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100264 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100265 mid = ' Press'
266 elif prefix.endswith(' '):
267 mid = 'press'
268 else:
269 mid = ' press'
Edward Lesmesae3586b2020-03-23 21:21:14 +0000270 gclient_utils.AskForData(
271 '%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100272
273
274def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000275 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Edward Lesmesae3586b2020-03-23 21:21:14 +0000276 result = gclient_utils.AskForData(prompt + ' [Yes/No]: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100277 while True:
278 if 'yes'.startswith(result):
279 return True
280 if 'no'.startswith(result):
281 return False
Edward Lesmesae3586b2020-03-23 21:21:14 +0000282 result = gclient_utils.AskForData('Please, type yes or no: ').lower()
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100283
284
machenbach@chromium.org45453142015-09-15 08:45:22 +0000285def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000286 prop_list = getattr(options, 'properties', [])
287 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000288 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000289 try:
290 properties[key] = json.loads(val)
291 except ValueError:
292 pass # If a value couldn't be evaluated, treat it as a string.
293 return properties
294
295
Edward Lemur4c707a22019-09-24 21:13:43 +0000296def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000297 """Calls a buildbucket v2 method and returns the parsed json response."""
298 headers = {
299 'Accept': 'application/json',
300 'Content-Type': 'application/json',
301 }
302 request = json.dumps(request)
303 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
304
305 logging.info('POST %s with %s' % (url, request))
306
307 attempts = 1
308 time_to_sleep = 1
309 while True:
310 response, content = http.request(url, 'POST', body=request, headers=headers)
311 if response.status == 200:
312 return json.loads(content[4:])
313 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
314 msg = '%s error when calling POST %s with %s: %s' % (
315 response.status, url, request, content)
316 raise BuildbucketResponseException(msg)
317 logging.debug(
318 '%s error when calling POST %s with %s. '
319 'Sleeping for %d seconds and retrying...' % (
320 response.status, url, request, time_to_sleep))
321 time.sleep(time_to_sleep)
322 time_to_sleep *= 2
323 attempts += 1
324
325 assert False, 'unreachable'
326
327
Edward Lemur6215c792019-10-03 21:59:05 +0000328def _parse_bucket(raw_bucket):
329 legacy = True
330 project = bucket = None
331 if '/' in raw_bucket:
332 legacy = False
333 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000334 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000335 elif raw_bucket.startswith('luci.'):
336 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000337 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000338 elif '.' in raw_bucket:
339 project = raw_bucket.split('.')[0]
340 bucket = raw_bucket
341 # Legacy buckets.
Edward Lemur45768512020-03-02 19:03:14 +0000342 if legacy and project and bucket:
Edward Lemur6215c792019-10-03 21:59:05 +0000343 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
344 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000345
346
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000347def _canonical_git_googlesource_host(host):
348 """Normalizes Gerrit hosts (with '-review') to Git host."""
349 assert host.endswith(_GOOGLESOURCE)
350 # Prefix doesn't include '.' at the end.
351 prefix = host[:-(1 + len(_GOOGLESOURCE))]
352 if prefix.endswith('-review'):
353 prefix = prefix[:-len('-review')]
354 return prefix + '.' + _GOOGLESOURCE
355
356
357def _canonical_gerrit_googlesource_host(host):
358 git_host = _canonical_git_googlesource_host(host)
359 prefix = git_host.split('.', 1)[0]
360 return prefix + '-review.' + _GOOGLESOURCE
361
362
363def _get_counterpart_host(host):
364 assert host.endswith(_GOOGLESOURCE)
365 git = _canonical_git_googlesource_host(host)
366 gerrit = _canonical_gerrit_googlesource_host(git)
367 return git if gerrit == host else gerrit
368
369
Quinten Yearsley777660f2020-03-04 23:37:06 +0000370def _trigger_tryjobs(changelist, jobs, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000371 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700372
373 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000374 changelist: Changelist that the tryjobs are associated with.
Edward Lemur45768512020-03-02 19:03:14 +0000375 jobs: A list of (project, bucket, builder).
qyearsley1fdfcb62016-10-24 13:22:03 -0700376 options: Command-line options.
377 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000378 print('Scheduling jobs on:')
Edward Lemur45768512020-03-02 19:03:14 +0000379 for project, bucket, builder in jobs:
380 print(' %s/%s: %s' % (project, bucket, builder))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000381 print('To see results here, run: git cl try-results')
382 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700383
Quinten Yearsley777660f2020-03-04 23:37:06 +0000384 requests = _make_tryjob_schedule_requests(changelist, jobs, options, patchset)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000385 if not requests:
386 return
387
Edward Lemur5b929a42019-10-21 17:57:39 +0000388 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000389 http.force_exception_to_status_code = True
390
391 batch_request = {'requests': requests}
Joanna Wanga8db0cb2023-01-24 15:43:17 +0000392 batch_response = _call_buildbucket(http, DEFAULT_BUILDBUCKET_HOST, 'Batch',
393 batch_request)
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000394
395 errors = [
396 ' ' + response['error']['message']
397 for response in batch_response.get('responses', [])
398 if 'error' in response
399 ]
400 if errors:
401 raise BuildbucketResponseException(
402 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
403
404
Quinten Yearsley777660f2020-03-04 23:37:06 +0000405def _make_tryjob_schedule_requests(changelist, jobs, options, patchset):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000406 """Constructs requests for Buildbucket to trigger tryjobs."""
Edward Lemurf0faf482019-09-25 20:40:17 +0000407 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000408 shared_properties = {
409 'category': options.ensure_value('category', 'git_cl_try')
410 }
411 if options.ensure_value('clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000412 shared_properties['clobber'] = True
413 shared_properties.update(_get_properties_from_options(options) or {})
414
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000415 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000416 if options.ensure_value('retry_failed', False):
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000417 shared_tags.append({'key': 'retry_failed',
418 'value': '1'})
419
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000420 requests = []
Edward Lemur45768512020-03-02 19:03:14 +0000421 for (project, bucket, builder) in jobs:
422 properties = shared_properties.copy()
423 if 'presubmit' in builder.lower():
424 properties['dry_run'] = 'true'
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000425
Edward Lemur45768512020-03-02 19:03:14 +0000426 requests.append({
427 'scheduleBuild': {
428 'requestId': str(uuid.uuid4()),
429 'builder': {
430 'project': getattr(options, 'project', None) or project,
431 'bucket': bucket,
432 'builder': builder,
433 },
434 'gerritChanges': gerrit_changes,
435 'properties': properties,
436 'tags': [
437 {'key': 'builder', 'value': builder},
438 ] + shared_tags,
439 }
440 })
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +0000442 if options.ensure_value('revision', None):
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000443 remote, remote_branch = changelist.GetRemoteBranch()
Edward Lemur45768512020-03-02 19:03:14 +0000444 requests[-1]['scheduleBuild']['gitilesCommit'] = {
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000445 'host': _canonical_git_googlesource_host(gerrit_changes[0]['host']),
Edward Lemur45768512020-03-02 19:03:14 +0000446 'project': gerrit_changes[0]['project'],
Josip Sokcevic9011a5b2021-02-12 18:59:44 +0000447 'id': options.revision,
448 'ref': GetTargetRef(remote, remote_branch, None)
Garrett Beaty08bb5c42022-09-21 17:34:20 +0000449 }
Anthony Polito1a5fe232020-01-24 23:17:52 +0000450
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000451 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000452
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000453
Quinten Yearsley777660f2020-03-04 23:37:06 +0000454def _fetch_tryjobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000456
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000457 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000458 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000459 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000460 request = {
461 'predicate': {
462 'gerritChanges': [changelist.GetGerritChange(patchset)],
463 },
464 'fields': ','.join('builds.*.' + field for field in fields),
465 }
tandrii221ab252016-10-06 08:12:04 -0700466
Edward Lemur5b929a42019-10-21 17:57:39 +0000467 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000468 if authenticator.has_cached_credentials():
469 http = authenticator.authorize(httplib2.Http())
470 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700471 print('Warning: Some results might be missing because %s' %
472 # Get the message on how to login.
Andrii Shyshkalov2517afd2021-01-19 17:07:43 +0000473 (str(auth.LoginRequiredError()),))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000474 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000475 http.force_exception_to_status_code = True
476
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000477 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
478 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000479
Edward Lemur45768512020-03-02 19:03:14 +0000480
Edward Lemur5b929a42019-10-21 17:57:39 +0000481def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000482 """Fetches builds from the latest patchset that has builds (within
483 the last few patchsets).
484
485 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000486 changelist (Changelist): The CL to fetch builds for
487 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000488 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
489 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000490 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000491 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
492 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000493 """
494 assert buildbucket_host
495 assert changelist.GetIssue(), 'CL must be uploaded first'
496 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000497 if latest_patchset is None:
498 assert changelist.GetMostRecentPatchset()
499 ps = changelist.GetMostRecentPatchset()
500 else:
501 assert latest_patchset > 0, latest_patchset
502 ps = latest_patchset
503
Quinten Yearsley983111f2019-09-26 17:18:48 +0000504 min_ps = max(1, ps - 5)
505 while ps >= min_ps:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000506 builds = _fetch_tryjobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000507 if len(builds):
508 return builds, ps
509 ps -= 1
510 return [], 0
511
512
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000513def _filter_failed_for_retry(all_builds):
514 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000515
516 Args:
Quinten Yearsley777660f2020-03-04 23:37:06 +0000517 all_builds (list): Builds, in the format returned by _fetch_tryjobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000518 i.e. a list of buildbucket.v2.Builds which includes status and builder
519 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000520
521 Returns:
Edward Lemur45768512020-03-02 19:03:14 +0000522 A dict {(proj, bucket): [builders]}. This is the same format accepted by
Quinten Yearsley777660f2020-03-04 23:37:06 +0000523 _trigger_tryjobs.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000524 """
Edward Lemur45768512020-03-02 19:03:14 +0000525 grouped = {}
526 for build in all_builds:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000527 builder = build['builder']
Edward Lemur45768512020-03-02 19:03:14 +0000528 key = (builder['project'], builder['bucket'], builder['builder'])
529 grouped.setdefault(key, []).append(build)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000530
Edward Lemur45768512020-03-02 19:03:14 +0000531 jobs = []
532 for (project, bucket, builder), builds in grouped.items():
533 if 'triggered' in builder:
534 print('WARNING: Not scheduling %s. Triggered bots require an initial job '
535 'from a parent. Please schedule a manual job for the parent '
536 'instead.')
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000537 continue
538 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
539 # Don't retry if any are running.
540 continue
Edward Lemur45768512020-03-02 19:03:14 +0000541 # If builder had several builds, retry only if the last one failed.
542 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
543 # build, but in case of retrying failed jobs retrying a flaky one makes
544 # sense.
545 builds = sorted(builds, key=lambda b: b['createTime'])
546 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
547 continue
548 # Don't retry experimental build previously triggered by CQ.
549 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
550 for t in builds[-1]['tags']):
551 continue
552 jobs.append((project, bucket, builder))
553
554 # Sort the jobs to make testing easier.
555 return sorted(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556
557
Quinten Yearsley777660f2020-03-04 23:37:06 +0000558def _print_tryjobs(options, builds):
559 """Prints nicely result of _fetch_tryjobs."""
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000561 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 return
563
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000564 longest_builder = max(len(b['builder']['builder']) for b in builds)
565 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000567 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
568 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000570 builds_by_status = {}
571 for b in builds:
572 builds_by_status.setdefault(b['status'], []).append({
573 'id': b['id'],
574 'name': name_fmt.format(
575 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
576 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 sort_key = lambda b: (b['name'], b['id'])
579
580 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000582 if not builds:
583 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000584
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000585 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000586 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000587 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000588 else:
589 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
590
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000591 print(colorize(title))
592 for b in sorted(builds, key=sort_key):
593 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594
595 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000596 print_builds(
597 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
598 print_builds(
599 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
600 color=Fore.MAGENTA)
601 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
602 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
603 color=Fore.MAGENTA)
Andrii Shyshkalov792630c2020-10-19 16:47:44 +0000604 print_builds('Started:', builds_by_status.pop('STARTED', []),
605 color=Fore.YELLOW)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000606 print_builds(
607 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000608 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000609 print_builds(
610 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000611 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612
613
Aiden Bennerc08566e2018-10-03 17:52:42 +0000614def _ComputeDiffLineRanges(files, upstream_commit):
615 """Gets the changed line ranges for each file since upstream_commit.
616
617 Parses a git diff on provided files and returns a dict that maps a file name
618 to an ordered list of range tuples in the form (start_line, count).
619 Ranges are in the same format as a git diff.
620 """
621 # If files is empty then diff_output will be a full diff.
622 if len(files) == 0:
623 return {}
624
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000625 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000626 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000627 diff_output = RunGit(diff_cmd)
628
629 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
630 # 2 capture groups
631 # 0 == fname of diff file
632 # 1 == 'diff_start,diff_count' or 'diff_start'
633 # will match each of
634 # diff --git a/foo.foo b/foo.py
635 # @@ -12,2 +14,3 @@
636 # @@ -12,2 +17 @@
637 # running re.findall on the above string with pattern will give
638 # [('foo.py', ''), ('', '14,3'), ('', '17')]
639
640 curr_file = None
641 line_diffs = {}
642 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
643 if match[0] != '':
644 # Will match the second filename in diff --git a/a.py b/b.py.
645 curr_file = match[0]
646 line_diffs[curr_file] = []
647 else:
648 # Matches +14,3
649 if ',' in match[1]:
650 diff_start, diff_count = match[1].split(',')
651 else:
652 # Single line changes are of the form +12 instead of +12,1.
653 diff_start = match[1]
654 diff_count = 1
655
656 diff_start = int(diff_start)
657 diff_count = int(diff_count)
658
659 # If diff_count == 0 this is a removal we can ignore.
660 line_diffs[curr_file].append((diff_start, diff_count))
661
662 return line_diffs
663
664
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000665def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000666 """Checks if a yapf file is in any parent directory of fpath until top_dir.
667
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000668 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000669 is found returns None. Uses yapf_config_cache as a cache for previously found
670 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000671 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000672 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000673 # Return result if we've already computed it.
674 if fpath in yapf_config_cache:
675 return yapf_config_cache[fpath]
676
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000677 parent_dir = os.path.dirname(fpath)
678 if os.path.isfile(fpath):
679 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000681 # Otherwise fpath is a directory
682 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
683 if os.path.isfile(yapf_file):
684 ret = yapf_file
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +0000685 elif fpath in (top_dir, parent_dir):
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000686 # If we're at the top level directory, or if we're at root
687 # there is no provided style.
688 ret = None
689 else:
690 # Otherwise recurse on the current directory.
691 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000692 yapf_config_cache[fpath] = ret
693 return ret
694
695
Brian Sheedyb4307d52019-12-02 19:18:17 +0000696def _GetYapfIgnorePatterns(top_dir):
697 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000698
699 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
700 but this functionality appears to break when explicitly passing files to
701 yapf for formatting. According to
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000702 https://github.com/google/yapf/blob/HEAD/README.rst#excluding-files-from-formatting-yapfignore,
Brian Sheedy59b06a82019-10-14 17:03:29 +0000703 the .yapfignore file should be in the directory that yapf is invoked from,
704 which we assume to be the top level directory in this case.
705
706 Args:
707 top_dir: The top level directory for the repository being formatted.
708
709 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000710 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000711 """
712 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000713 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000714 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000715 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000716
Anthony Politoc64e3902021-04-30 21:55:25 +0000717 for line in gclient_utils.FileRead(yapfignore_file).split('\n'):
718 stripped_line = line.strip()
719 # Comments and blank lines should be ignored.
720 if stripped_line.startswith('#') or stripped_line == '':
721 continue
722 ignore_patterns.add(stripped_line)
Brian Sheedyb4307d52019-12-02 19:18:17 +0000723 return ignore_patterns
724
725
726def _FilterYapfIgnoredFiles(filepaths, patterns):
727 """Filters out any filepaths that match any of the given patterns.
728
729 Args:
730 filepaths: An iterable of strings containing filepaths to filter.
731 patterns: An iterable of strings containing fnmatch patterns to filter on.
732
733 Returns:
734 A list of strings containing all the elements of |filepaths| that did not
735 match any of the patterns in |patterns|.
736 """
737 # Not inlined so that tests can use the same implementation.
738 return [f for f in filepaths
739 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000740
741
Aaron Gable13101a62018-02-09 13:20:41 -0800742def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000743 """Prints statistics about the change to the user."""
744 # --no-ext-diff is broken in some versions of Git, so try to work around
745 # this by overriding the environment (but there is still a problem if the
746 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000747 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000748 if 'GIT_EXTERNAL_DIFF' in env:
749 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800752 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000753 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754
755
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000756class BuildbucketResponseException(Exception):
757 pass
758
759
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000760class Settings(object):
761 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000762 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000763 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764 self.tree_status_url = None
765 self.viewvc_url = None
766 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000767 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000768 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000769 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000770 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000771 self.format_full_by_default = None
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000772 self.is_status_commit_order_by_date = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000773
Edward Lemur26964072020-02-19 19:18:51 +0000774 def _LazyUpdateIfNeeded(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 """Updates the settings from a codereview.settings file, if available."""
Edward Lemur26964072020-02-19 19:18:51 +0000776 if self.updated:
777 return
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000778
Edward Lemur26964072020-02-19 19:18:51 +0000779 # The only value that actually changes the behavior is
780 # autoupdate = "false". Everything else means "true".
781 autoupdate = (
782 scm.GIT.GetConfig(self.GetRoot(), 'rietveld.autoupdate', '').lower())
783
784 cr_settings_file = FindCodereviewSettingsFile()
785 if autoupdate != 'false' and cr_settings_file:
786 LoadCodereviewSettingsFromFile(cr_settings_file)
787 cr_settings_file.close()
788
789 self.updated = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000791 @staticmethod
792 def GetRelativeRoot():
Edward Lesmes50da7702020-03-30 19:23:43 +0000793 return scm.GIT.GetCheckoutRoot('.')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000794
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 if self.root is None:
797 self.root = os.path.abspath(self.GetRelativeRoot())
798 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000799
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000800 def GetTreeStatusUrl(self, error_ok=False):
801 if not self.tree_status_url:
Edward Lemur26964072020-02-19 19:18:51 +0000802 self.tree_status_url = self._GetConfig('rietveld.tree-status-url')
803 if self.tree_status_url is None and not error_ok:
804 DieWithError(
805 'You must configure your tree status URL by running '
806 '"git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807 return self.tree_status_url
808
809 def GetViewVCUrl(self):
810 if not self.viewvc_url:
Edward Lemur26964072020-02-19 19:18:51 +0000811 self.viewvc_url = self._GetConfig('rietveld.viewvc-url')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 return self.viewvc_url
813
rmistry@google.com90752582014-01-14 21:04:50 +0000814 def GetBugPrefix(self):
Edward Lemur26964072020-02-19 19:18:51 +0000815 return self._GetConfig('rietveld.bug-prefix')
rmistry@google.com78948ed2015-07-08 23:09:57 +0000816
rmistry@google.com5626a922015-02-26 14:03:30 +0000817 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000818 run_post_upload_hook = self._GetConfig(
Edward Lemur26964072020-02-19 19:18:51 +0000819 'rietveld.run-post-upload-hook')
rmistry@google.com5626a922015-02-26 14:03:30 +0000820 return run_post_upload_hook == "True"
821
Joanna Wangc8f23e22023-01-19 21:18:10 +0000822 def GetDefaultCCList(self):
823 return self._GetConfig('rietveld.cc')
824
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000825 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000826 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000827 if self.squash_gerrit_uploads is None:
Edward Lesmes4de54132020-05-05 19:41:33 +0000828 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
829 if self.squash_gerrit_uploads is None:
Edward Lemur26964072020-02-19 19:18:51 +0000830 # Default is squash now (http://crbug.com/611892#c23).
831 self.squash_gerrit_uploads = self._GetConfig(
832 'gerrit.squash-uploads').lower() != 'false'
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000833 return self.squash_gerrit_uploads
834
Edward Lesmes4de54132020-05-05 19:41:33 +0000835 def GetSquashGerritUploadsOverride(self):
836 """Return True or False if codereview.settings should be overridden.
837
838 Returns None if no override has been defined.
839 """
840 # See also http://crbug.com/611892#c23
841 result = self._GetConfig('gerrit.override-squash-uploads').lower()
842 if result == 'true':
843 return True
844 if result == 'false':
845 return False
846 return None
847
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +0000848 def GetIsGerrit(self):
849 """Return True if gerrit.host is set."""
850 if self.is_gerrit is None:
851 self.is_gerrit = bool(self._GetConfig('gerrit.host', False))
852 return self.is_gerrit
853
tandrii@chromium.org28253532016-04-14 13:46:56 +0000854 def GetGerritSkipEnsureAuthenticated(self):
855 """Return True if EnsureAuthenticated should not be done for Gerrit
856 uploads."""
857 if self.gerrit_skip_ensure_authenticated is None:
Edward Lemur26964072020-02-19 19:18:51 +0000858 self.gerrit_skip_ensure_authenticated = self._GetConfig(
859 'gerrit.skip-ensure-authenticated').lower() == 'true'
tandrii@chromium.org28253532016-04-14 13:46:56 +0000860 return self.gerrit_skip_ensure_authenticated
861
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000862 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000863 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000864 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000865 # Git requires single quotes for paths with spaces. We need to replace
866 # them with double quotes for Windows to treat such paths as a single
867 # path.
Edward Lemur26964072020-02-19 19:18:51 +0000868 self.git_editor = self._GetConfig('core.editor').replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000869 return self.git_editor or None
870
thestig@chromium.org44202a22014-03-11 19:22:18 +0000871 def GetLintRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000872 return self._GetConfig('rietveld.cpplint-regex', DEFAULT_LINT_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000873
874 def GetLintIgnoreRegex(self):
Edward Lemur26964072020-02-19 19:18:51 +0000875 return self._GetConfig(
876 'rietveld.cpplint-ignore-regex', DEFAULT_LINT_IGNORE_REGEX)
thestig@chromium.org44202a22014-03-11 19:22:18 +0000877
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000878 def GetFormatFullByDefault(self):
879 if self.format_full_by_default is None:
Jamie Madillac6f6232021-07-07 20:54:08 +0000880 self._LazyUpdateIfNeeded()
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000881 result = (
882 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
883 error_ok=True).strip())
884 self.format_full_by_default = (result == 'true')
885 return self.format_full_by_default
886
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +0000887 def IsStatusCommitOrderByDate(self):
888 if self.is_status_commit_order_by_date is None:
889 result = (RunGit(['config', '--bool', 'cl.date-order'],
890 error_ok=True).strip())
891 self.is_status_commit_order_by_date = (result == 'true')
892 return self.is_status_commit_order_by_date
893
Edward Lemur26964072020-02-19 19:18:51 +0000894 def _GetConfig(self, key, default=''):
895 self._LazyUpdateIfNeeded()
896 return scm.GIT.GetConfig(self.GetRoot(), key, default)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000897
898
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000899class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000900 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000901 NONE = 'none'
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000902 QUICK_RUN = 'quick_run'
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000903 DRY_RUN = 'dry_run'
904 COMMIT = 'commit'
905
Greg Gutermanbe5fccd2021-06-14 17:58:20 +0000906 ALL_STATES = [NONE, QUICK_RUN, DRY_RUN, COMMIT]
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000907
908
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000909class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000910 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000911 self.issue = issue
912 self.patchset = patchset
913 self.hostname = hostname
914
915 @property
916 def valid(self):
917 return self.issue is not None
918
919
Edward Lemurf38bc172019-09-03 21:02:13 +0000920def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000921 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
922 fail_result = _ParsedIssueNumberArgument()
923
Edward Lemur678a6842019-10-03 22:25:05 +0000924 if isinstance(arg, int):
925 return _ParsedIssueNumberArgument(issue=arg)
926 if not isinstance(arg, basestring):
927 return fail_result
928
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000929 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +0000930 return _ParsedIssueNumberArgument(issue=int(arg))
Aaron Gableaee6c852017-06-26 12:49:01 -0700931
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000932 url = gclient_utils.UpgradeToHttps(arg)
Alex Turner30ae6372022-01-04 02:32:52 +0000933 if not url.startswith('http'):
934 return fail_result
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000935 for gerrit_url, short_url in _KNOWN_GERRIT_TO_SHORT_URLS.items():
936 if url.startswith(short_url):
937 url = gerrit_url + url[len(short_url):]
938 break
939
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000940 try:
Edward Lemur79d4f992019-11-11 23:49:02 +0000941 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000942 except ValueError:
943 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200944
Alex Turner30ae6372022-01-04 02:32:52 +0000945 # If "https://" was automatically added, fail if `arg` looks unlikely to be a
946 # URL.
947 if not arg.startswith('http') and '.' not in parsed_url.netloc:
948 return fail_result
949
Edward Lemur678a6842019-10-03 22:25:05 +0000950 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
951 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
952 # Short urls like https://domain/<issue_number> can be used, but don't allow
953 # specifying the patchset (you'd 404), but we allow that here.
954 if parsed_url.path == '/':
955 part = parsed_url.fragment
956 else:
957 part = parsed_url.path
958
959 match = re.match(
960 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
961 if not match:
962 return fail_result
963
964 issue = int(match.group('issue'))
965 patchset = match.group('patchset')
966 return _ParsedIssueNumberArgument(
967 issue=issue,
968 patchset=int(patchset) if patchset else None,
969 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000970
971
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000972def _create_description_from_log(args):
973 """Pulls out the commit log to use as a base for the CL description."""
974 log_args = []
Bruce Dawson13acea32022-05-03 22:13:08 +0000975 if len(args) == 1 and args[0] == None:
976 # Handle the case where None is passed as the branch.
977 return ''
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000978 if len(args) == 1 and not args[0].endswith('.'):
979 log_args = [args[0] + '..']
980 elif len(args) == 1 and args[0].endswith('...'):
981 log_args = [args[0][:-1]]
982 elif len(args) == 2:
983 log_args = [args[0] + '..' + args[1]]
984 else:
985 log_args = args[:] # Hope for the best!
Manh Nguyene3644862020-08-05 18:25:46 +0000986 return RunGit(['log', '--pretty=format:%B%n'] + log_args)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +0000987
988
Aaron Gablea45ee112016-11-22 15:14:38 -0800989class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -0700990 def __init__(self, issue, url):
991 self.issue = issue
992 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -0800993 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -0700994
995 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -0800996 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -0700997 self.issue, self.url)
998
999
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001000_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001001 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001002 # TODO(tandrii): these two aren't known in Gerrit.
1003 'approval', 'disapproval'])
1004
1005
Joanna Wang6215dd02023-02-07 15:58:03 +00001006# TODO(b/265929888): Change `parent` to `pushed_commit_base`.
Joanna Wange8523912023-01-21 02:05:40 +00001007_NewUpload = collections.namedtuple('NewUpload', [
Joanna Wang40497912023-01-24 21:18:16 +00001008 'reviewers', 'ccs', 'commit_to_push', 'new_last_uploaded_commit', 'parent',
Joanna Wang7603f042023-03-01 22:17:36 +00001009 'change_desc', 'prev_patchset'
Joanna Wange8523912023-01-21 02:05:40 +00001010])
1011
1012
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001014 """Changelist works with one changelist in local branch.
1015
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001016 Notes:
1017 * Not safe for concurrent multi-{thread,process} use.
1018 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001019 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001020 """
1021
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001022 def __init__(self,
1023 branchref=None,
1024 issue=None,
1025 codereview_host=None,
1026 commit_date=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001027 """Create a new ChangeList instance.
1028
Edward Lemurf38bc172019-09-03 21:02:13 +00001029 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001030 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001032 global settings
1033 if not settings:
1034 # Happens when git_cl.py is used as a utility library.
1035 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001036
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001037 self.branchref = branchref
1038 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001039 assert branchref.startswith('refs/heads/')
Edward Lemur85153282020-02-14 22:06:29 +00001040 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001041 else:
1042 self.branch = None
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001043 self.commit_date = commit_date
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001044 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001045 self.lookedup_issue = False
1046 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001048 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001049 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001050 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001051 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001052 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001053 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001054
Edward Lemur125d60a2019-09-13 18:25:41 +00001055 # Lazily cached values.
1056 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1057 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Edward Lesmese1576912021-02-16 21:53:34 +00001058 self._owners_client = None
Edward Lemur125d60a2019-09-13 18:25:41 +00001059 # Map from change number (issue) to its detail cache.
1060 self._detail_cache = {}
1061
1062 if codereview_host is not None:
1063 assert not codereview_host.startswith('https://'), codereview_host
1064 self._gerrit_host = codereview_host
1065 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001066
Edward Lesmese1576912021-02-16 21:53:34 +00001067 @property
1068 def owners_client(self):
1069 if self._owners_client is None:
1070 remote, remote_branch = self.GetRemoteBranch()
1071 branch = GetTargetRef(remote, remote_branch, None)
1072 self._owners_client = owners_client.GetCodeOwnersClient(
Edward Lesmese1576912021-02-16 21:53:34 +00001073 host=self.GetGerritHost(),
1074 project=self.GetGerritProject(),
1075 branch=branch)
1076 return self._owners_client
1077
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001078 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001079 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001080
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001081 The return value is a string suitable for passing to git cl with the --cc
1082 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001083 """
1084 if self.cc is None:
Joanna Wangc8f23e22023-01-19 21:18:10 +00001085 base_cc = settings.GetDefaultCCList()
1086 more_cc = ','.join(self.more_cc)
1087 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001088 return self.cc
1089
Daniel Cheng7227d212017-11-17 08:12:37 -08001090 def ExtendCC(self, more_cc):
1091 """Extends the list of users to cc on this CL based on the changed files."""
1092 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00001094 def GetCommitDate(self):
1095 """Returns the commit date as provided in the constructor"""
1096 return self.commit_date
1097
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 def GetBranch(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001099 """Returns the short branch name, e.g. 'main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001100 if not self.branch:
Edward Lemur85153282020-02-14 22:06:29 +00001101 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001102 if not branchref:
1103 return None
1104 self.branchref = branchref
Edward Lemur85153282020-02-14 22:06:29 +00001105 self.branch = scm.GIT.ShortBranchName(self.branchref)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106 return self.branch
1107
1108 def GetBranchRef(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001109 """Returns the full branch name, e.g. 'refs/heads/main'."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110 self.GetBranch() # Poke the lazy loader.
1111 return self.branchref
1112
Edward Lemur85153282020-02-14 22:06:29 +00001113 def _GitGetBranchConfigValue(self, key, default=None):
1114 return scm.GIT.GetBranchConfig(
1115 settings.GetRoot(), self.GetBranch(), key, default)
tandrii5d48c322016-08-18 16:19:37 -07001116
Edward Lemur85153282020-02-14 22:06:29 +00001117 def _GitSetBranchConfigValue(self, key, value):
1118 action = 'set %s to %r' % (key, value)
1119 if not value:
1120 action = 'unset %s' % key
1121 assert self.GetBranch(), 'a branch is needed to ' + action
1122 return scm.GIT.SetBranchConfig(
1123 settings.GetRoot(), self.GetBranch(), key, value)
tandrii5d48c322016-08-18 16:19:37 -07001124
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001125 @staticmethod
1126 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001127 """Returns a tuple containing remote and remote ref,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001128 e.g. 'origin', 'refs/heads/main'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 """
Edward Lemur15a9b8c2020-02-13 00:52:30 +00001130 remote, upstream_branch = scm.GIT.FetchUpstreamTuple(
1131 settings.GetRoot(), branch)
1132 if not remote or not upstream_branch:
1133 DieWithError(
1134 'Unable to determine default branch to diff against.\n'
Josip Sokcevicb038f722021-01-06 18:28:11 +00001135 'Verify this branch is set up to track another \n'
1136 '(via the --track argument to "git checkout -b ..."). \n'
1137 'or pass complete "git diff"-style arguments if supported, like\n'
1138 ' git cl upload origin/main\n')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139
1140 return remote, upstream_branch
1141
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001142 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001143 upstream_branch = self.GetUpstreamBranch()
Edward Lesmes50da7702020-03-30 19:23:43 +00001144 if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001145 DieWithError('The upstream for the current branch (%s) does not exist '
1146 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001147 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001148 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001149
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 def GetUpstreamBranch(self):
1151 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001152 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001153 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001154 upstream_branch = upstream_branch.replace('refs/heads/',
1155 'refs/remotes/%s/' % remote)
1156 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1157 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158 self.upstream_branch = upstream_branch
1159 return self.upstream_branch
1160
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001161 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001162 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 remote, branch = None, self.GetBranch()
1164 seen_branches = set()
1165 while branch not in seen_branches:
1166 seen_branches.add(branch)
1167 remote, branch = self.FetchUpstreamTuple(branch)
Edward Lemur85153282020-02-14 22:06:29 +00001168 branch = scm.GIT.ShortBranchName(branch)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 if remote != '.' or branch.startswith('refs/remotes'):
1170 break
1171 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001172 remotes = RunGit(['remote'], error_ok=True).split()
1173 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001175 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001176 remote = 'origin'
Gavin Make6a62332020-12-04 21:57:10 +00001177 logging.warning('Could not determine which remote this change is '
1178 'associated with, so defaulting to "%s".' %
1179 self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001180 else:
Gavin Make6a62332020-12-04 21:57:10 +00001181 logging.warning('Could not determine which remote this change is '
1182 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001183 branch = 'HEAD'
1184 if branch.startswith('refs/remotes'):
1185 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001186 elif branch.startswith('refs/branch-heads/'):
1187 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001188 else:
1189 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001190 return self._remote
1191
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001192 def GetRemoteUrl(self):
1193 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1194
1195 Returns None if there is no remote.
1196 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001197 is_cached, value = self._cached_remote_url
1198 if is_cached:
1199 return value
1200
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001201 remote, _ = self.GetRemoteBranch()
Edward Lemur26964072020-02-19 19:18:51 +00001202 url = scm.GIT.GetConfig(settings.GetRoot(), 'remote.%s.url' % remote, '')
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001203
Edward Lemur298f2cf2019-02-22 21:40:39 +00001204 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001205 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001206 if host:
1207 self._cached_remote_url = (True, url)
1208 return url
1209
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001210 # If it cannot be parsed as an url, assume it is a local directory,
1211 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001212 logging.warning('"%s" doesn\'t appear to point to a git host. '
1213 'Interpreting it as a local directory.', url)
1214 if not os.path.isdir(url):
1215 logging.error(
Josip906bfde2020-01-31 22:38:49 +00001216 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1217 'but it doesn\'t exist.',
1218 {'remote': remote, 'branch': self.GetBranch(), 'url': url})
Edward Lemur298f2cf2019-02-22 21:40:39 +00001219 return None
1220
1221 cache_path = url
Edward Lemur26964072020-02-19 19:18:51 +00001222 url = scm.GIT.GetConfig(url, 'remote.%s.url' % remote, '')
Edward Lemur298f2cf2019-02-22 21:40:39 +00001223
Edward Lemur79d4f992019-11-11 23:49:02 +00001224 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001225 if not host:
1226 logging.error(
1227 'Remote "%(remote)s" for branch "%(branch)s" points to '
1228 '"%(cache_path)s", but it is misconfigured.\n'
1229 '"%(cache_path)s" must be a git repo and must have a remote named '
1230 '"%(remote)s" pointing to the git host.', {
1231 'remote': remote,
1232 'cache_path': cache_path,
1233 'branch': self.GetBranch()})
1234 return None
1235
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001236 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001237 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001238
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001239 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001240 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001241 if self.issue is None and not self.lookedup_issue:
Bruce Dawson13acea32022-05-03 22:13:08 +00001242 if self.GetBranch():
1243 self.issue = self._GitGetBranchConfigValue(ISSUE_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001244 if self.issue is not None:
1245 self.issue = int(self.issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001246 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 return self.issue
1248
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001249 def GetIssueURL(self, short=False):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001251 issue = self.GetIssue()
1252 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001253 return None
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00001254 server = self.GetCodereviewServer()
1255 if short:
1256 server = _KNOWN_GERRIT_TO_SHORT_URLS.get(server, server)
1257 return '%s/%s' % (server, issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258
Edward Lemur6c6827c2020-02-06 21:15:18 +00001259 def FetchDescription(self, pretty=False):
1260 assert self.GetIssue(), 'issue is required to query Gerrit'
1261
Edward Lemur9aa1a962020-02-25 00:58:38 +00001262 if self.description is None:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001263 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
1264 current_rev = data['current_revision']
1265 self.description = data['revisions'][current_rev]['commit']['message']
Edward Lemur6c6827c2020-02-06 21:15:18 +00001266
1267 if not pretty:
1268 return self.description
1269
1270 # Set width to 72 columns + 2 space indent.
1271 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
1272 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1273 lines = self.description.splitlines()
1274 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275
1276 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001277 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001278 if self.patchset is None and not self.lookedup_patchset:
Bruce Dawson13acea32022-05-03 22:13:08 +00001279 if self.GetBranch():
1280 self.patchset = self._GitGetBranchConfigValue(PATCHSET_CONFIG_KEY)
Edward Lemur85153282020-02-14 22:06:29 +00001281 if self.patchset is not None:
1282 self.patchset = int(self.patchset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001283 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284 return self.patchset
1285
Edward Lemur9aa1a962020-02-25 00:58:38 +00001286 def GetAuthor(self):
1287 return scm.GIT.GetConfig(settings.GetRoot(), 'user.email')
1288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001290 """Set this branch's patchset. If patchset=0, clears the patchset."""
1291 assert self.GetBranch()
1292 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001293 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001294 else:
1295 self.patchset = int(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00001296 self._GitSetBranchConfigValue(PATCHSET_CONFIG_KEY, str(self.patchset))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001298 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001299 """Set this branch's issue. If issue isn't given, clears the issue."""
1300 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001302 issue = int(issue)
Edward Lesmes50da7702020-03-30 19:23:43 +00001303 self._GitSetBranchConfigValue(ISSUE_CONFIG_KEY, str(issue))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001304 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001305 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001306 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001307 self._GitSetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001308 CODEREVIEW_SERVER_CONFIG_KEY, codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001309 else:
tandrii5d48c322016-08-18 16:19:37 -07001310 # Reset all of these just to be clean.
1311 reset_suffixes = [
Gavin Makbe2e9262022-11-08 23:41:55 +00001312 LAST_UPLOAD_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001313 ISSUE_CONFIG_KEY,
1314 PATCHSET_CONFIG_KEY,
1315 CODEREVIEW_SERVER_CONFIG_KEY,
Gavin Makbe2e9262022-11-08 23:41:55 +00001316 GERRIT_SQUASH_HASH_CONFIG_KEY,
Edward Lesmes50da7702020-03-30 19:23:43 +00001317 ]
tandrii5d48c322016-08-18 16:19:37 -07001318 for prop in reset_suffixes:
Edward Lemur85153282020-02-14 22:06:29 +00001319 try:
1320 self._GitSetBranchConfigValue(prop, None)
1321 except subprocess2.CalledProcessError:
1322 pass
Aaron Gableca01e2c2017-07-19 11:16:02 -07001323 msg = RunGit(['log', '-1', '--format=%B']).strip()
1324 if msg and git_footers.get_footer_change_id(msg):
1325 print('WARNING: The change patched into this branch has a Change-Id. '
1326 'Removing it.')
1327 RunGit(['commit', '--amend', '-m',
1328 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001329 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001330 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001331 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001332
Joanna Wangb46232e2023-01-21 01:58:46 +00001333 def GetAffectedFiles(self, upstream, end_commit=None):
1334 # type: (str, Optional[str]) -> Sequence[str]
1335 """Returns the list of affected files for the given commit range."""
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001336 try:
Joanna Wangb46232e2023-01-21 01:58:46 +00001337 return [
1338 f for _, f in scm.GIT.CaptureStatus(
1339 settings.GetRoot(), upstream, end_commit=end_commit)
1340 ]
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001341 except subprocess2.CalledProcessError:
1342 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001343 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001344 'This branch probably doesn\'t exist anymore. To reset the\n'
1345 'tracking branch, please run\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001346 ' git branch --set-upstream-to origin/main %s\n'
1347 'or replace origin/main with the relevant branch') %
Edward Lemur2c62b332020-03-12 22:12:33 +00001348 (upstream, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001349
dsansomee2d6fd92016-09-08 00:10:47 -07001350 def UpdateDescription(self, description, force=False):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001351 assert self.GetIssue(), 'issue is required to update description'
1352
1353 if gerrit_util.HasPendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001354 self.GetGerritHost(), self._GerritChangeIdentifier()):
Edward Lemur6c6827c2020-02-06 21:15:18 +00001355 if not force:
1356 confirm_or_exit(
1357 'The description cannot be modified while the issue has a pending '
1358 'unpublished edit. Either publish the edit in the Gerrit web UI '
1359 'or delete it.\n\n', action='delete the unpublished edit')
1360
1361 gerrit_util.DeletePendingChangeEdit(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001362 self.GetGerritHost(), self._GerritChangeIdentifier())
Edward Lemur6c6827c2020-02-06 21:15:18 +00001363 gerrit_util.SetCommitMessage(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001364 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur6c6827c2020-02-06 21:15:18 +00001365 description, notify='NONE')
1366
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001367 self.description = description
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001368
Edward Lemur75526302020-02-27 22:31:05 +00001369 def _GetCommonPresubmitArgs(self, verbose, upstream):
Edward Lemur227d5102020-02-25 23:45:35 +00001370 args = [
Edward Lemur227d5102020-02-25 23:45:35 +00001371 '--root', settings.GetRoot(),
1372 '--upstream', upstream,
1373 ]
1374
1375 args.extend(['--verbose'] * verbose)
1376
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001377 remote, remote_branch = self.GetRemoteBranch()
1378 target_ref = GetTargetRef(remote, remote_branch, None)
Aleksey Khoroshilov35ef5ad2022-06-03 18:29:25 +00001379 if settings.GetIsGerrit():
1380 args.extend(['--gerrit_url', self.GetCodereviewServer()])
1381 args.extend(['--gerrit_project', self.GetGerritProject()])
1382 args.extend(['--gerrit_branch', target_ref])
Edward Lesmeseb1bd622021-03-01 19:54:07 +00001383
Edward Lemur99df04e2020-03-05 19:39:43 +00001384 author = self.GetAuthor()
Edward Lemur227d5102020-02-25 23:45:35 +00001385 issue = self.GetIssue()
1386 patchset = self.GetPatchset()
Edward Lemur99df04e2020-03-05 19:39:43 +00001387 if author:
1388 args.extend(['--author', author])
Edward Lemur227d5102020-02-25 23:45:35 +00001389 if issue:
1390 args.extend(['--issue', str(issue)])
1391 if patchset:
1392 args.extend(['--patchset', str(patchset)])
Edward Lemur227d5102020-02-25 23:45:35 +00001393
Edward Lemur75526302020-02-27 22:31:05 +00001394 return args
1395
Josip Sokcevic017544d2022-03-31 23:47:53 +00001396 def RunHook(self,
1397 committing,
1398 may_prompt,
1399 verbose,
1400 parallel,
1401 upstream,
1402 description,
1403 all_files,
1404 files=None,
1405 resultdb=False,
1406 realm=None):
Edward Lemur75526302020-02-27 22:31:05 +00001407 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1408 args = self._GetCommonPresubmitArgs(verbose, upstream)
1409 args.append('--commit' if committing else '--upload')
Edward Lemur227d5102020-02-25 23:45:35 +00001410 if may_prompt:
1411 args.append('--may_prompt')
1412 if parallel:
1413 args.append('--parallel')
1414 if all_files:
1415 args.append('--all_files')
Josip Sokcevic017544d2022-03-31 23:47:53 +00001416 if files:
1417 args.extend(files.split(';'))
1418 args.append('--source_controlled_only')
Bruce Dawson09c0c072022-05-26 20:28:58 +00001419 if files or all_files:
1420 args.append('--no_diffs')
Edward Lemur227d5102020-02-25 23:45:35 +00001421
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001422 if resultdb and not realm:
1423 # TODO (crbug.com/1113463): store realm somewhere and look it up so
1424 # it is not required to pass the realm flag
1425 print('Note: ResultDB reporting will NOT be performed because --realm'
1426 ' was not specified. To enable ResultDB, please run the command'
1427 ' again with the --realm argument to specify the LUCI realm.')
1428
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001429 return self._RunPresubmit(args,
1430 description,
1431 resultdb=resultdb,
1432 realm=realm)
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001433
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001434 def _RunPresubmit(self,
1435 args,
1436 description,
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001437 resultdb=None,
1438 realm=None):
1439 # type: (Sequence[str], str, bool, Optional[bool], Optional[str]
1440 # ) -> Mapping[str, Any]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001441 args = args[:]
Dirk Pranke61bf6e82021-04-23 00:50:21 +00001442
Edward Lemur227d5102020-02-25 23:45:35 +00001443 with gclient_utils.temporary_file() as description_file:
1444 with gclient_utils.temporary_file() as json_output:
Edward Lemur1a83da12020-03-04 21:18:36 +00001445 gclient_utils.FileWrite(description_file, description)
Edward Lemur227d5102020-02-25 23:45:35 +00001446 args.extend(['--json_output', json_output])
1447 args.extend(['--description_file', description_file])
Edward Lemur227d5102020-02-25 23:45:35 +00001448 start = time_time()
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001449 cmd = ['vpython3', PRESUBMIT_SUPPORT] + args
Saagar Sanghavi03b15132020-08-10 16:43:41 +00001450 if resultdb and realm:
1451 cmd = ['rdb', 'stream', '-new', '-realm', realm, '--'] + cmd
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001452
1453 p = subprocess2.Popen(cmd)
Edward Lemur227d5102020-02-25 23:45:35 +00001454 exit_code = p.wait()
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001455
Edward Lemur227d5102020-02-25 23:45:35 +00001456 metrics.collector.add_repeated('sub_commands', {
1457 'command': 'presubmit',
1458 'execution_time': time_time() - start,
1459 'exit_code': exit_code,
1460 })
1461
1462 if exit_code:
1463 sys.exit(exit_code)
1464
1465 json_results = gclient_utils.FileRead(json_output)
1466 return json.loads(json_results)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001468 def RunPostUploadHook(self, verbose, upstream, description):
Edward Lemur75526302020-02-27 22:31:05 +00001469 args = self._GetCommonPresubmitArgs(verbose, upstream)
1470 args.append('--post_upload')
1471
1472 with gclient_utils.temporary_file() as description_file:
Edward Lemur1a83da12020-03-04 21:18:36 +00001473 gclient_utils.FileWrite(description_file, description)
Edward Lemur75526302020-02-27 22:31:05 +00001474 args.extend(['--description_file', description_file])
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001475 subprocess2.Popen(['vpython3', PRESUBMIT_SUPPORT] + args).wait()
Edward Lemur75526302020-02-27 22:31:05 +00001476
Edward Lemur5a644f82020-03-18 16:44:57 +00001477 def _GetDescriptionForUpload(self, options, git_diff_args, files):
Joanna Wangb46232e2023-01-21 01:58:46 +00001478 # type: (optparse.Values, Sequence[str], Sequence[str]
1479 # ) -> ChangeDescription
1480 """Get description message for upload."""
Edward Lemur5a644f82020-03-18 16:44:57 +00001481 if self.GetIssue():
1482 description = self.FetchDescription()
1483 elif options.message:
1484 description = options.message
1485 else:
1486 description = _create_description_from_log(git_diff_args)
1487 if options.title and options.squash:
Edward Lesmes0dd54822020-03-26 18:24:25 +00001488 description = options.title + '\n\n' + description
Edward Lemur5a644f82020-03-18 16:44:57 +00001489
Edward Lemur5a644f82020-03-18 16:44:57 +00001490 bug = options.bug
1491 fixed = options.fixed
Josip Sokcevic340edc32021-07-08 17:01:46 +00001492 if not self.GetIssue():
1493 # Extract bug number from branch name, but only if issue is being created.
1494 # It must start with bug or fix, followed by _ or - and number.
1495 # Optionally, it may contain _ or - after number with arbitrary text.
1496 # Examples:
1497 # bug-123
1498 # bug_123
1499 # fix-123
1500 # fix-123-some-description
mlcui7a0b4cb2023-01-23 23:14:55 +00001501 branch = self.GetBranch()
1502 if branch is not None:
1503 match = re.match(
1504 r'^(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)([-_]|$)', branch)
1505 if not bug and not fixed and match:
1506 if match.group('type') == 'bug':
1507 bug = match.group('bugnum')
1508 else:
1509 fixed = match.group('bugnum')
Edward Lemur5a644f82020-03-18 16:44:57 +00001510
1511 change_description = ChangeDescription(description, bug, fixed)
1512
Joanna Wang39811b12023-01-20 23:09:48 +00001513 # Fill gaps in OWNERS coverage to reviewers if requested.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001514 if options.add_owners_to:
Joanna Wang39811b12023-01-20 23:09:48 +00001515 assert options.add_owners_to in ('R'), options.add_owners_to
Edward Lesmese1576912021-02-16 21:53:34 +00001516 status = self.owners_client.GetFilesApprovalStatus(
Joanna Wang39811b12023-01-20 23:09:48 +00001517 files, [], options.reviewers)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001518 missing_files = [
1519 f for f in files
Edward Lesmese1576912021-02-16 21:53:34 +00001520 if status[f] == self._owners_client.INSUFFICIENT_REVIEWERS
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001521 ]
Edward Lesmese1576912021-02-16 21:53:34 +00001522 owners = self.owners_client.SuggestOwners(
1523 missing_files, exclude=[self.GetAuthor()])
Joanna Wang39811b12023-01-20 23:09:48 +00001524 assert isinstance(options.reviewers, list), options.reviewers
1525 options.reviewers.extend(owners)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001526
Edward Lemur5a644f82020-03-18 16:44:57 +00001527 # Set the reviewer list now so that presubmit checks can access it.
Joanna Wang39811b12023-01-20 23:09:48 +00001528 if options.reviewers:
1529 change_description.update_reviewers(options.reviewers)
Edward Lemur5a644f82020-03-18 16:44:57 +00001530
1531 return change_description
1532
Joanna Wanga1abbed2023-01-24 01:41:05 +00001533 def _GetTitleForUpload(self, options, multi_change_upload=False):
1534 # type: (optparse.Values, Optional[bool]) -> str
1535
1536 # Getting titles for multipl commits is not supported so we return the
1537 # default.
1538 if not options.squash or multi_change_upload or options.title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001539 return options.title
1540
1541 # On first upload, patchset title is always this string, while options.title
1542 # gets converted to first line of message.
1543 if not self.GetIssue():
1544 return 'Initial upload'
1545
1546 # When uploading subsequent patchsets, options.message is taken as the title
1547 # if options.title is not provided.
Edward Lemur5a644f82020-03-18 16:44:57 +00001548 if options.message:
1549 return options.message.strip()
1550
1551 # Use the subject of the last commit as title by default.
Edward Lesmes50da7702020-03-30 19:23:43 +00001552 title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00001553 if options.force or options.skip_title:
Edward Lemur5a644f82020-03-18 16:44:57 +00001554 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001555 user_title = gclient_utils.AskForData('Title for patchset [%s]: ' % title)
mlcui3da91712021-05-05 10:00:30 +00001556
1557 # Use the default title if the user confirms the default with a 'y'.
1558 if user_title.lower() == 'y':
1559 return title
Edward Lesmesae3586b2020-03-23 21:21:14 +00001560 return user_title or title
Edward Lemur5a644f82020-03-18 16:44:57 +00001561
Joanna Wang562481d2023-01-26 21:57:14 +00001562 def _GetRefSpecOptions(self,
1563 options,
1564 change_desc,
1565 multi_change_upload=False,
1566 dogfood_path=False):
1567 # type: (optparse.Values, Sequence[Changelist], Optional[bool],
1568 # Optional[bool]) -> Sequence[str]
Joanna Wanga1abbed2023-01-24 01:41:05 +00001569
1570 # Extra options that can be specified at push time. Doc:
1571 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
1572 refspec_opts = []
1573
1574 # By default, new changes are started in WIP mode, and subsequent patchsets
1575 # don't send email. At any time, passing --send-mail or --send-email will
1576 # mark the change ready and send email for that particular patch.
1577 if options.send_mail:
1578 refspec_opts.append('ready')
1579 refspec_opts.append('notify=ALL')
Joanna Wang562481d2023-01-26 21:57:14 +00001580 elif (not self.GetIssue() and options.squash and not dogfood_path):
Joanna Wanga1abbed2023-01-24 01:41:05 +00001581 refspec_opts.append('wip')
1582 else:
1583 refspec_opts.append('notify=NONE')
1584
1585 # TODO(tandrii): options.message should be posted as a comment if
1586 # --send-mail or --send-email is set on non-initial upload as Rietveld used
1587 # to do it.
1588
1589 # Set options.title in case user was prompted in _GetTitleForUpload and
1590 # _CMDUploadChange needs to be called again.
1591 options.title = self._GetTitleForUpload(
1592 options, multi_change_upload=multi_change_upload)
1593
1594 if options.title:
1595 # Punctuation and whitespace in |title| must be percent-encoded.
1596 refspec_opts.append('m=' +
1597 gerrit_util.PercentEncodeForGitRef(options.title))
1598
1599 if options.private:
1600 refspec_opts.append('private')
1601
1602 if options.topic:
1603 # Documentation on Gerrit topics is here:
1604 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
1605 refspec_opts.append('topic=%s' % options.topic)
1606
1607 if options.enable_auto_submit:
1608 refspec_opts.append('l=Auto-Submit+1')
1609 if options.set_bot_commit:
1610 refspec_opts.append('l=Bot-Commit+1')
1611 if options.use_commit_queue:
1612 refspec_opts.append('l=Commit-Queue+2')
1613 elif options.cq_dry_run:
1614 refspec_opts.append('l=Commit-Queue+1')
1615 elif options.cq_quick_run:
1616 refspec_opts.append('l=Commit-Queue+1')
1617 refspec_opts.append('l=Quick-Run+1')
1618
1619 if change_desc.get_reviewers(tbr_only=True):
1620 score = gerrit_util.GetCodeReviewTbrScore(self.GetGerritHost(),
1621 self.GetGerritProject())
1622 refspec_opts.append('l=Code-Review+%s' % score)
1623
Joanna Wang40497912023-01-24 21:18:16 +00001624 # Gerrit sorts hashtags, so order is not important.
1625 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
1626 # We check GetIssue because we only add hashtags from the
1627 # description on the first upload.
Joanna Wang562481d2023-01-26 21:57:14 +00001628 # TODO(b/265929888): When we fully launch the new path:
1629 # 1) remove fetching hashtags from description alltogether
1630 # 2) Or use descrtiption hashtags for:
1631 # `not (self.GetIssue() and multi_change_upload)`
1632 # 3) Or enabled change description tags for multi and single changes
1633 # by adding them post `git push`.
1634 if not (self.GetIssue() and dogfood_path):
Joanna Wang40497912023-01-24 21:18:16 +00001635 hashtags.update(change_desc.get_hash_tags())
1636 refspec_opts.extend(['hashtag=%s' % t for t in hashtags])
Joanna Wang40497912023-01-24 21:18:16 +00001637
1638 # Note: Reviewers, and ccs are handled individually for each
Joanna Wanga1abbed2023-01-24 01:41:05 +00001639 # branch/change.
1640 return refspec_opts
1641
Joanna Wang05b60342023-03-29 20:25:57 +00001642 def PrepareSquashedCommit(self,
1643 options,
1644 parent,
1645 orig_parent,
1646 end_commit=None):
1647 # type: (optparse.Values, str, str, Optional[str]) -> _NewUpload()
1648 """Create a squashed commit to upload.
1649
1650
1651 Args:
1652 parent: The commit to use as the parent for the new squashed.
1653 orig_parent: The commit that is an actual ancestor of `end_commit`. It
1654 is part of the same original tree as end_commit, which does not
1655 contain squashed commits. This is used to create the change
1656 description for the new squashed commit with:
1657 `git log orig_parent..end_commit`.
1658 end_commit: The commit to use as the end of the new squashed commit.
1659 """
Joanna Wangb88a4342023-01-24 01:28:22 +00001660
1661 if end_commit is None:
1662 end_commit = RunGit(['rev-parse', self.branchref]).strip()
1663
Joanna Wang05b60342023-03-29 20:25:57 +00001664 reviewers, ccs, change_desc = self._PrepareChange(options, orig_parent,
Joanna Wangb88a4342023-01-24 01:28:22 +00001665 end_commit)
1666 latest_tree = RunGit(['rev-parse', end_commit + ':']).strip()
1667 with gclient_utils.temporary_file() as desc_tempfile:
1668 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
1669 commit_to_push = RunGit(
1670 ['commit-tree', latest_tree, '-p', parent, '-F',
1671 desc_tempfile]).strip()
1672
Joanna Wang7603f042023-03-01 22:17:36 +00001673 # Gerrit may or may not update fast enough to return the correct patchset
1674 # number after we push. Get the pre-upload patchset and increment later.
1675 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang40497912023-01-24 21:18:16 +00001676 return _NewUpload(reviewers, ccs, commit_to_push, end_commit, parent,
Joanna Wang7603f042023-03-01 22:17:36 +00001677 change_desc, prev_patchset)
Joanna Wangb88a4342023-01-24 01:28:22 +00001678
Joanna Wang6215dd02023-02-07 15:58:03 +00001679 def PrepareCherryPickSquashedCommit(self, options, parent):
1680 # type: (optparse.Values, str) -> _NewUpload()
Joanna Wange8523912023-01-21 02:05:40 +00001681 """Create a commit cherry-picked on parent to push."""
1682
Joanna Wang6215dd02023-02-07 15:58:03 +00001683 # The `parent` is what we will cherry-pick on top of.
1684 # The `cherry_pick_base` is the beginning range of what
1685 # we are cherry-picking.
1686 cherry_pick_base = self.GetCommonAncestorWithUpstream()
1687 reviewers, ccs, change_desc = self._PrepareChange(options, cherry_pick_base,
Joanna Wange8523912023-01-21 02:05:40 +00001688 self.branchref)
1689
1690 new_upload_hash = RunGit(['rev-parse', self.branchref]).strip()
1691 latest_tree = RunGit(['rev-parse', self.branchref + ':']).strip()
1692 with gclient_utils.temporary_file() as desc_tempfile:
1693 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
Joanna Wang6215dd02023-02-07 15:58:03 +00001694 commit_to_cp = RunGit([
1695 'commit-tree', latest_tree, '-p', cherry_pick_base, '-F',
1696 desc_tempfile
1697 ]).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001698
Joanna Wang6215dd02023-02-07 15:58:03 +00001699 RunGit(['checkout', '-q', parent])
Joanna Wange8523912023-01-21 02:05:40 +00001700 ret, _out = RunGitWithCode(['cherry-pick', commit_to_cp])
1701 if ret:
1702 RunGit(['cherry-pick', '--abort'])
1703 RunGit(['checkout', '-q', self.branch])
1704 DieWithError('Could not cleanly cherry-pick')
1705
Joanna Wang6215dd02023-02-07 15:58:03 +00001706 commit_to_push = RunGit(['rev-parse', 'HEAD']).strip()
Joanna Wange8523912023-01-21 02:05:40 +00001707 RunGit(['checkout', '-q', self.branch])
1708
Joanna Wang7603f042023-03-01 22:17:36 +00001709 # Gerrit may or may not update fast enough to return the correct patchset
1710 # number after we push. Get the pre-upload patchset and increment later.
1711 prev_patchset = self.GetMostRecentPatchset(update=False) or 0
Joanna Wang6215dd02023-02-07 15:58:03 +00001712 return _NewUpload(reviewers, ccs, commit_to_push, new_upload_hash,
Joanna Wang7603f042023-03-01 22:17:36 +00001713 cherry_pick_base, change_desc, prev_patchset)
Joanna Wange8523912023-01-21 02:05:40 +00001714
Joanna Wangb46232e2023-01-21 01:58:46 +00001715 def _PrepareChange(self, options, parent, end_commit):
1716 # type: (optparse.Values, str, str) ->
1717 # Tuple[Sequence[str], Sequence[str], ChangeDescription]
1718 """Prepares the change to be uploaded."""
1719 self.EnsureCanUploadPatchset(options.force)
1720
1721 files = self.GetAffectedFiles(parent, end_commit=end_commit)
1722 change_desc = self._GetDescriptionForUpload(options, [parent, end_commit],
1723 files)
1724
1725 watchlist = watchlists.Watchlists(settings.GetRoot())
1726 self.ExtendCC(watchlist.GetWatchersForPaths(files))
1727 if not options.bypass_hooks:
1728 hook_results = self.RunHook(committing=False,
1729 may_prompt=not options.force,
1730 verbose=options.verbose,
1731 parallel=options.parallel,
1732 upstream=parent,
1733 description=change_desc.description,
1734 all_files=False)
1735 self.ExtendCC(hook_results['more_cc'])
1736
1737 # Update the change description and ensure we have a Change Id.
1738 if self.GetIssue():
1739 if options.edit_description:
1740 change_desc.prompt()
1741 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
1742 change_id = change_detail['change_id']
1743 change_desc.ensure_change_id(change_id)
1744
Joanna Wangb46232e2023-01-21 01:58:46 +00001745 else: # No change issue. First time uploading
1746 if not options.force and not options.message_file:
1747 change_desc.prompt()
1748
1749 # Check if user added a change_id in the descripiton.
1750 change_ids = git_footers.get_footer_change_id(change_desc.description)
1751 if len(change_ids) == 1:
1752 change_id = change_ids[0]
1753 else:
1754 change_id = GenerateGerritChangeId(change_desc.description)
1755 change_desc.ensure_change_id(change_id)
1756
1757 if options.preserve_tryjobs:
1758 change_desc.set_preserve_tryjobs()
1759
1760 SaveDescriptionBackup(change_desc)
1761
1762 # Add ccs
1763 ccs = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00001764 # Add default, watchlist, presubmit ccs if this is the initial upload
Joanna Wangb46232e2023-01-21 01:58:46 +00001765 # and CL is not private and auto-ccing has not been disabled.
Joanna Wangc4ac3022023-01-31 21:19:57 +00001766 if not options.private and not options.no_autocc and not self.GetIssue():
Joanna Wangb46232e2023-01-21 01:58:46 +00001767 ccs = self.GetCCList().split(',')
1768 if len(ccs) > 100:
1769 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
1770 'process/lsc/lsc_workflow.md')
1771 print('WARNING: This will auto-CC %s users.' % len(ccs))
1772 print('LSC may be more appropriate: %s' % lsc)
1773 print('You can also use the --no-autocc flag to disable auto-CC.')
1774 confirm_or_exit(action='continue')
1775
1776 # Add ccs from the --cc flag.
1777 if options.cc:
1778 ccs.extend(options.cc)
1779
1780 ccs = [email.strip() for email in ccs if email.strip()]
1781 if change_desc.get_cced():
1782 ccs.extend(change_desc.get_cced())
1783
1784 return change_desc.get_reviewers(), ccs, change_desc
1785
Joanna Wang40497912023-01-24 21:18:16 +00001786 def PostUploadUpdates(self, options, new_upload, change_number):
1787 # type: (optparse.Values, _NewUpload, change_number) -> None
1788 """Makes necessary post upload changes to the local and remote cl."""
1789 if not self.GetIssue():
1790 self.SetIssue(change_number)
1791
Joanna Wang7603f042023-03-01 22:17:36 +00001792 self.SetPatchset(new_upload.prev_patchset + 1)
1793
Joanna Wang40497912023-01-24 21:18:16 +00001794 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY,
1795 new_upload.commit_to_push)
1796 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY,
1797 new_upload.new_last_uploaded_commit)
1798
1799 if settings.GetRunPostUploadHook():
1800 self.RunPostUploadHook(options.verbose, new_upload.parent,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001801 new_upload.change_desc.description)
Joanna Wang40497912023-01-24 21:18:16 +00001802
1803 if new_upload.reviewers or new_upload.ccs:
1804 gerrit_util.AddReviewers(self.GetGerritHost(),
1805 self._GerritChangeIdentifier(),
1806 reviewers=new_upload.reviewers,
1807 ccs=new_upload.ccs,
1808 notify=bool(options.send_mail))
1809
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001810 def CMDUpload(self, options, git_diff_args, orig_args):
1811 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001812 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001813 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001814 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001815 else:
1816 if self.GetBranch() is None:
1817 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1818
1819 # Default to diffing against common ancestor of upstream branch
1820 base_branch = self.GetCommonAncestorWithUpstream()
1821 git_diff_args = [base_branch, 'HEAD']
1822
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001823 # Fast best-effort checks to abort before running potentially expensive
1824 # hooks if uploading is likely to fail anyway. Passing these checks does
1825 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001826 self.EnsureAuthenticated(force=options.force)
1827 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001828
1829 # Apply watchlists on upload.
Edward Lemur2c62b332020-03-12 22:12:33 +00001830 watchlist = watchlists.Watchlists(settings.GetRoot())
1831 files = self.GetAffectedFiles(base_branch)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001832 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001833 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001834
Edward Lemur5a644f82020-03-18 16:44:57 +00001835 change_desc = self._GetDescriptionForUpload(options, git_diff_args, files)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001836 if not options.bypass_hooks:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00001837 hook_results = self.RunHook(committing=False,
1838 may_prompt=not options.force,
1839 verbose=options.verbose,
1840 parallel=options.parallel,
1841 upstream=base_branch,
1842 description=change_desc.description,
1843 all_files=False)
Edward Lemur227d5102020-02-25 23:45:35 +00001844 self.ExtendCC(hook_results['more_cc'])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001845
Aaron Gable13101a62018-02-09 13:20:41 -08001846 print_stats(git_diff_args)
Edward Lemura12175c2020-03-09 16:58:26 +00001847 ret = self.CMDUploadChange(
Edward Lemur5a644f82020-03-18 16:44:57 +00001848 options, git_diff_args, custom_cl_base, change_desc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001849 if not ret:
mlcui7a0b4cb2023-01-23 23:14:55 +00001850 if self.GetBranch() is not None:
1851 self._GitSetBranchConfigValue(
1852 LAST_UPLOAD_HASH_CONFIG_KEY,
1853 scm.GIT.ResolveCommit(settings.GetRoot(), 'HEAD'))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001854 # Run post upload hooks, if specified.
1855 if settings.GetRunPostUploadHook():
Brian Sheedy7326ca22022-11-02 18:36:17 +00001856 self.RunPostUploadHook(options.verbose, base_branch,
Robert Iannucci3d6d2d22023-05-11 17:25:05 +00001857 change_desc.description)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858
1859 # Upload all dependencies if specified.
1860 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001861 print()
1862 print('--dependencies has been specified.')
1863 print('All dependent local branches will be re-uploaded.')
1864 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001865 # Remove the dependencies flag from args so that we do not end up in a
1866 # loop.
1867 orig_args.remove('--dependencies')
Jose Lopes3863fc52020-04-07 17:00:25 +00001868 ret = upload_branch_deps(self, orig_args, options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001869 return ret
1870
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001871 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001872 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001873
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001874 Issue must have been already uploaded and known. Optionally allows for
1875 updating Quick-Run (QR) state.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001876 """
1877 assert new_state in _CQState.ALL_STATES
1878 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001879 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001880 vote_map = {
1881 _CQState.NONE: 0,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001882 _CQState.QUICK_RUN: 1,
Edward Lemur125d60a2019-09-13 18:25:41 +00001883 _CQState.DRY_RUN: 1,
1884 _CQState.COMMIT: 2,
1885 }
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00001886 if new_state == _CQState.QUICK_RUN:
1887 labels = {
1888 'Commit-Queue': vote_map[_CQState.DRY_RUN],
1889 'Quick-Run': vote_map[_CQState.QUICK_RUN],
1890 }
1891 else:
1892 labels = {'Commit-Queue': vote_map[new_state]}
Edward Lemur125d60a2019-09-13 18:25:41 +00001893 notify = False if new_state == _CQState.DRY_RUN else None
1894 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001895 self.GetGerritHost(), self._GerritChangeIdentifier(),
Edward Lemur125d60a2019-09-13 18:25:41 +00001896 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001897 return 0
1898 except KeyboardInterrupt:
1899 raise
1900 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001901 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001902 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001903 ' * Your project has no CQ,\n'
1904 ' * You don\'t have permission to change the CQ state,\n'
1905 ' * There\'s a bug in this code (see stack trace below).\n'
1906 'Consider specifying which bots to trigger manually or asking your '
1907 'project owners for permissions or contacting Chrome Infra at:\n'
1908 'https://www.chromium.org/infra\n\n' %
1909 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001910 # Still raise exception so that stack trace is printed.
1911 raise
1912
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001913 def GetGerritHost(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001914 # Lazy load of configs.
1915 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001916 if self._gerrit_host and '.' not in self._gerrit_host:
1917 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1918 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001919 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001920 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001921 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001922 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001923 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1924 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 return self._gerrit_host
1926
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001927 def _GetGitHost(self):
1928 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001929 remote_url = self.GetRemoteUrl()
1930 if not remote_url:
1931 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001932 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001933
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 def GetCodereviewServer(self):
1935 if not self._gerrit_server:
1936 # If we're on a branch then get the server potentially associated
1937 # with that branch.
Edward Lemur85153282020-02-14 22:06:29 +00001938 if self.GetIssue() and self.GetBranch():
tandrii5d48c322016-08-18 16:19:37 -07001939 self._gerrit_server = self._GitGetBranchConfigValue(
Edward Lesmes50da7702020-03-30 19:23:43 +00001940 CODEREVIEW_SERVER_CONFIG_KEY)
tandrii5d48c322016-08-18 16:19:37 -07001941 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001942 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 if not self._gerrit_server:
1944 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1945 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001946 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 parts[0] = parts[0] + '-review'
1948 self._gerrit_host = '.'.join(parts)
1949 self._gerrit_server = 'https://%s' % self._gerrit_host
1950 return self._gerrit_server
1951
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001952 def GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001953 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001954 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001955 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001956 logging.warning('can\'t detect Gerrit project.')
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001957 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001958 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001959 if project.endswith('.git'):
1960 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001961 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1962 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1963 # gitiles/git-over-https protocol. E.g.,
1964 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1965 # as
1966 # https://chromium.googlesource.com/v8/v8
1967 if project.startswith('a/'):
1968 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001969 return project
1970
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001971 def _GerritChangeIdentifier(self):
1972 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1973
1974 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001975 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001976 """
Edward Lesmeseeca9c62020-11-20 00:00:17 +00001977 project = self.GetGerritProject()
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001978 if project:
1979 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1980 # Fall back on still unique, but less efficient change number.
1981 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001982
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001983 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001984 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001985 if settings.GetGerritSkipEnsureAuthenticated():
1986 # For projects with unusual authentication schemes.
1987 # See http://crbug.com/603378.
1988 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001989
1990 # Check presence of cookies only if using cookies-based auth method.
1991 cookie_auth = gerrit_util.Authenticator.get()
1992 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001993 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001994
Florian Mayerae510e82020-01-30 21:04:48 +00001995 remote_url = self.GetRemoteUrl()
1996 if remote_url is None:
Josip906bfde2020-01-31 22:38:49 +00001997 logging.warning('invalid remote')
Florian Mayerae510e82020-01-30 21:04:48 +00001998 return
Joanna Wang46ffd1b2022-09-16 20:44:44 +00001999 if urllib.parse.urlparse(remote_url).scheme not in ['https', 'sso']:
2000 logging.warning(
2001 'Ignoring branch %(branch)s with non-https/sso remote '
2002 '%(remote)s', {
2003 'branch': self.branch,
2004 'remote': self.GetRemoteUrl()
2005 })
Daniel Chengcf6269b2019-05-18 01:02:12 +00002006 return
2007
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002008 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002009 self.GetCodereviewServer()
2010 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002011 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002012
2013 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2014 git_auth = cookie_auth.get_auth_header(git_host)
2015 if gerrit_auth and git_auth:
2016 if gerrit_auth == git_auth:
2017 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002018 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00002019 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002020 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021 ' %s\n'
2022 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002023 ' Consider running the following command:\n'
2024 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002025 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00002026 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002027 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002028 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002029 cookie_auth.get_new_password_message(git_host)))
2030 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002031 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032 return
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002033
2034 missing = (
2035 ([] if gerrit_auth else [self._gerrit_host]) +
2036 ([] if git_auth else [git_host]))
2037 DieWithError('Credentials for the following hosts are required:\n'
2038 ' %s\n'
2039 'These are read from %s (or legacy %s)\n'
2040 '%s' % (
2041 '\n '.join(missing),
2042 cookie_auth.get_gitcookies_path(),
2043 cookie_auth.get_netrc_path(),
2044 cookie_auth.get_new_password_message(git_host)))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002045
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002046 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002047 if not self.GetIssue():
2048 return
2049
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002050 status = self._GetChangeDetail()['status']
Joanna Wang583ca662022-04-27 21:17:17 +00002051 if status == 'ABANDONED':
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00002052 DieWithError(
2053 'Change %s has been abandoned, new uploads are not allowed' %
2054 (self.GetIssueURL()))
Joanna Wang583ca662022-04-27 21:17:17 +00002055 if status == 'MERGED':
2056 answer = gclient_utils.AskForData(
2057 'Change %s has been submitted, new uploads are not allowed. '
2058 'Would you like to start a new change (Y/n)?' % self.GetIssueURL()
2059 ).lower()
2060 if answer not in ('y', ''):
2061 DieWithError('New uploads are not allowed.')
2062 self.SetIssue()
2063 return
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002064
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002065 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2066 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2067 # Apparently this check is not very important? Otherwise get_auth_email
2068 # could have been added to other implementations of Authenticator.
2069 cookies_auth = gerrit_util.Authenticator.get()
2070 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002071 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002072
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002073 cookies_user = cookies_auth.get_auth_email(self.GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002074 if self.GetIssueOwner() == cookies_user:
2075 return
2076 logging.debug('change %s owner is %s, cookies user is %s',
2077 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002078 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002079 # so ask what Gerrit thinks of this user.
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002080 details = gerrit_util.GetAccountDetails(self.GetGerritHost(), 'self')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002081 if details['email'] == self.GetIssueOwner():
2082 return
2083 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002084 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002085 'as %s.\n'
2086 'Uploading may fail due to lack of permissions.' %
2087 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2088 confirm_or_exit(action='upload')
2089
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002090 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002091 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002092 or CQ status, assuming adherence to a common workflow.
2093
2094 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002095 * 'error' - error from review tool (including deleted issues)
2096 * 'unsent' - no reviewers added
2097 * 'waiting' - waiting for review
2098 * 'reply' - waiting for uploader to reply to review
2099 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002100 * 'dry-run' - dry-running in the CQ
2101 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07002102 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002103 """
2104 if not self.GetIssue():
2105 return None
2106
2107 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002108 data = self._GetChangeDetail([
2109 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00002110 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002111 return 'error'
2112
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002113 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002114 return 'closed'
2115
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002116 cq_label = data['labels'].get('Commit-Queue', {})
2117 max_cq_vote = 0
2118 for vote in cq_label.get('all', []):
2119 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
2120 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002121 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00002122 if max_cq_vote == 1:
2123 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002124
Aaron Gable9ab38c62017-04-06 14:36:33 -07002125 if data['labels'].get('Code-Review', {}).get('approved'):
2126 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002127
2128 if not data.get('reviewers', {}).get('REVIEWER', []):
2129 return 'unsent'
2130
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002131 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00002132 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002133 while messages:
2134 m = messages.pop()
Andrii Shyshkalov899785a2021-07-09 12:45:37 +00002135 if (m.get('tag', '').startswith('autogenerated:cq') or
2136 m.get('tag', '').startswith('autogenerated:cv')):
2137 # Ignore replies from LUCI CV/CQ.
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002138 continue
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002139 if m.get('author', {}).get('_account_id') == owner:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002140 # Most recent message was by owner.
2141 return 'waiting'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002142
2143 # Some reply from non-owner.
2144 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002145
2146 # Somehow there are no messages even though there are reviewers.
2147 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002148
Gavin Mak4e5e3992022-11-14 22:40:12 +00002149 def GetMostRecentPatchset(self, update=True):
Edward Lemur6c6827c2020-02-06 21:15:18 +00002150 if not self.GetIssue():
2151 return None
2152
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002153 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002154 patchset = data['revisions'][data['current_revision']]['_number']
Gavin Mak4e5e3992022-11-14 22:40:12 +00002155 if update:
2156 self.SetPatchset(patchset)
Aaron Gablee8856ee2017-12-07 12:41:46 -08002157 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002158
Gavin Makf35a9eb2022-11-17 18:34:36 +00002159 def _IsPatchsetRangeSignificant(self, lower, upper):
2160 """Returns True if the inclusive range of patchsets contains any reworks or
2161 rebases."""
2162 if not self.GetIssue():
2163 return False
2164
2165 data = self._GetChangeDetail(['ALL_REVISIONS'])
2166 ps_kind = {}
2167 for rev_info in data.get('revisions', {}).values():
2168 ps_kind[rev_info['_number']] = rev_info.get('kind', '')
2169
2170 for ps in range(lower, upper + 1):
2171 assert ps in ps_kind, 'expected patchset %d in change detail' % ps
2172 if ps_kind[ps] not in ('NO_CHANGE', 'NO_CODE_CHANGE'):
2173 return True
2174 return False
2175
Gavin Make61ccc52020-11-13 00:12:57 +00002176 def GetMostRecentDryRunPatchset(self):
2177 """Get patchsets equivalent to the most recent patchset and return
2178 the patchset with the latest dry run. If none have been dry run, return
2179 the latest patchset."""
2180 if not self.GetIssue():
2181 return None
2182
2183 data = self._GetChangeDetail(['ALL_REVISIONS'])
2184 patchset = data['revisions'][data['current_revision']]['_number']
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00002185 dry_run = {int(m['_revision_number'])
2186 for m in data.get('messages', [])
2187 if m.get('tag', '').endswith('dry-run')}
Gavin Make61ccc52020-11-13 00:12:57 +00002188
2189 for revision_info in sorted(data.get('revisions', {}).values(),
2190 key=lambda c: c['_number'], reverse=True):
2191 if revision_info['_number'] in dry_run:
2192 patchset = revision_info['_number']
2193 break
2194 if revision_info.get('kind', '') not in \
2195 ('NO_CHANGE', 'NO_CODE_CHANGE', 'TRIVIAL_REBASE'):
2196 break
2197 self.SetPatchset(patchset)
2198 return patchset
2199
Aaron Gable636b13f2017-07-14 10:42:48 -07002200 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002201 gerrit_util.SetReview(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002202 self.GetGerritHost(), self._GerritChangeIdentifier(),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002203 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002204
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002205 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002206 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002207 # CURRENT_REVISION is included to get the latest patchset so that
2208 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002209 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002210 options=['MESSAGES', 'DETAILED_ACCOUNTS',
2211 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002212 file_comments = gerrit_util.GetChangeComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002213 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002214 robot_file_comments = gerrit_util.GetChangeRobotComments(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002215 self.GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002216
2217 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00002218 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002219 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002220 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002221 line_comments = file_comments.setdefault(path, [])
2222 line_comments.extend(
2223 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002224
2225 # Build dictionary of file comments for easy access and sorting later.
2226 # {author+date: {path: {patchset: {line: url+message}}}}
2227 comments = collections.defaultdict(
2228 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002229
2230 server = self.GetCodereviewServer()
2231 if server in _KNOWN_GERRIT_TO_SHORT_URLS:
2232 # /c/ is automatically added by short URL server.
2233 url_prefix = '%s/%s' % (_KNOWN_GERRIT_TO_SHORT_URLS[server],
2234 self.GetIssue())
2235 else:
2236 url_prefix = '%s/c/%s' % (server, self.GetIssue())
2237
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002238 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002239 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002240 tag = comment.get('tag', '')
2241 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002242 continue
2243 key = (comment['author']['email'], comment['updated'])
2244 if comment.get('side', 'REVISION') == 'PARENT':
2245 patchset = 'Base'
2246 else:
2247 patchset = 'PS%d' % comment['patch_set']
2248 line = comment.get('line', 0)
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002249 url = ('%s/%s/%s#%s%s' %
2250 (url_prefix, comment['patch_set'], path,
2251 'b' if comment.get('side') == 'PARENT' else '',
2252 str(line) if line else ''))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002253 comments[key][path][patchset][line] = (url, comment['message'])
2254
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002255 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002256 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002257 summary = self._BuildCommentSummary(msg, comments, readable)
2258 if summary:
2259 summaries.append(summary)
2260 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002261
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002262 @staticmethod
2263 def _BuildCommentSummary(msg, comments, readable):
Josip Sokcevic266129c2021-11-09 00:22:00 +00002264 if 'email' not in msg['author']:
2265 # Some bot accounts may not have an email associated.
2266 return None
2267
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002268 key = (msg['author']['email'], msg['date'])
2269 # Don't bother showing autogenerated messages that don't have associated
2270 # file or line comments. this will filter out most autogenerated
2271 # messages, but will keep robot comments like those from Tricium.
2272 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
2273 if is_autogenerated and not comments.get(key):
2274 return None
2275 message = msg['message']
2276 # Gerrit spits out nanoseconds.
2277 assert len(msg['date'].split('.')[-1]) == 9
2278 date = datetime.datetime.strptime(msg['date'][:-3],
2279 '%Y-%m-%d %H:%M:%S.%f')
2280 if key in comments:
2281 message += '\n'
2282 for path, patchsets in sorted(comments.get(key, {}).items()):
2283 if readable:
2284 message += '\n%s' % path
2285 for patchset, lines in sorted(patchsets.items()):
2286 for line, (url, content) in sorted(lines.items()):
2287 if line:
2288 line_str = 'Line %d' % line
2289 path_str = '%s:%d:' % (path, line)
2290 else:
2291 line_str = 'File comment'
2292 path_str = '%s:0:' % path
2293 if readable:
2294 message += '\n %s, %s: %s' % (patchset, line_str, url)
2295 message += '\n %s\n' % content
2296 else:
2297 message += '\n%s ' % path_str
2298 message += '\n%s\n' % content
2299
2300 return _CommentSummary(
2301 date=date,
2302 message=message,
2303 sender=msg['author']['email'],
2304 autogenerated=is_autogenerated,
2305 # These could be inferred from the text messages and correlated with
2306 # Code-Review label maximum, however this is not reliable.
2307 # Leaving as is until the need arises.
2308 approval=False,
2309 disapproval=False,
2310 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002311
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002312 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002313 gerrit_util.AbandonChange(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002314 self.GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002315
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002316 def SubmitIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002317 gerrit_util.SubmitChange(
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002318 self.GetGerritHost(), self._GerritChangeIdentifier())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002319
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002320 def _GetChangeDetail(self, options=None):
2321 """Returns details of associated Gerrit change and caching results."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002322 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002323 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002324
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002325 # Optimization to avoid multiple RPCs:
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002326 if 'CURRENT_REVISION' in options or 'ALL_REVISIONS' in options:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002327 options.append('CURRENT_COMMIT')
2328
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002329 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002330 cache_key = str(self.GetIssue())
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002331 options_set = frozenset(o.upper() for o in options)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002332
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002333 for cached_options_set, data in self._detail_cache.get(cache_key, []):
2334 # Assumption: data fetched before with extra options is suitable
2335 # for return for a smaller set of options.
2336 # For example, if we cached data for
2337 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2338 # and request is for options=[CURRENT_REVISION],
2339 # THEN we can return prior cached data.
2340 if options_set.issubset(cached_options_set):
2341 return data
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002342
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002343 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002344 data = gerrit_util.GetChangeDetail(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002345 self.GetGerritHost(), self._GerritChangeIdentifier(), options_set)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002346 except gerrit_util.GerritError as e:
2347 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002348 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002349 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002350
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002351 self._detail_cache.setdefault(cache_key, []).append((options_set, data))
tandriic2405f52016-10-10 08:13:15 -07002352 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002353
Gavin Mak4e5e3992022-11-14 22:40:12 +00002354 def _GetChangeCommit(self, revision='current'):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002355 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002356 try:
Gavin Mak4e5e3992022-11-14 22:40:12 +00002357 data = gerrit_util.GetChangeCommit(self.GetGerritHost(),
2358 self._GerritChangeIdentifier(),
2359 revision)
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002360 except gerrit_util.GerritError as e:
2361 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002362 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002363 raise
agable32978d92016-11-01 12:55:02 -07002364 return data
2365
Karen Qian40c19422019-03-13 21:28:29 +00002366 def _IsCqConfigured(self):
2367 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002368 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002369
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002370 def CMDLand(self, force, bypass_hooks, verbose, parallel, resultdb, realm):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002371 if git_common.is_dirty_git_tree('land'):
2372 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002373
tandriid60367b2016-06-22 05:25:12 -07002374 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002375 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002376 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002377 'which can test and land changes for you. '
2378 'Are you sure you wish to bypass it?\n',
2379 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002380 differs = True
Gavin Makbe2e9262022-11-08 23:41:55 +00002381 last_upload = self._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002382 # Note: git diff outputs nothing if there is no diff.
2383 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002384 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002385 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002386 if detail['current_revision'] == last_upload:
2387 differs = False
2388 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002389 print('WARNING: Local branch contents differ from latest uploaded '
2390 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002391 if differs:
2392 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002393 confirm_or_exit(
2394 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2395 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002396 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002397 elif not bypass_hooks:
Edward Lemur227d5102020-02-25 23:45:35 +00002398 upstream = self.GetCommonAncestorWithUpstream()
2399 if self.GetIssue():
2400 description = self.FetchDescription()
2401 else:
Edward Lemura12175c2020-03-09 16:58:26 +00002402 description = _create_description_from_log([upstream])
Edward Lemur227d5102020-02-25 23:45:35 +00002403 self.RunHook(
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002404 committing=True,
2405 may_prompt=not force,
2406 verbose=verbose,
Edward Lemur227d5102020-02-25 23:45:35 +00002407 parallel=parallel,
2408 upstream=upstream,
2409 description=description,
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002410 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002411 resultdb=resultdb,
2412 realm=realm)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002413
Xinan Lin1bd4ffa2021-07-28 00:54:22 +00002414 self.SubmitIssue()
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002415 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002416 links = self._GetChangeCommit().get('web_links', [])
2417 for link in links:
Michael Mosse371c642021-09-29 16:41:04 +00002418 if link.get('name') in ['gitiles', 'browse'] and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002419 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002420 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002421 return 0
2422
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002423 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force,
2424 newbranch):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002425 assert parsed_issue_arg.valid
2426
Edward Lemur125d60a2019-09-13 18:25:41 +00002427 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002428
2429 if parsed_issue_arg.hostname:
2430 self._gerrit_host = parsed_issue_arg.hostname
2431 self._gerrit_server = 'https://%s' % self._gerrit_host
2432
tandriic2405f52016-10-10 08:13:15 -07002433 try:
2434 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002435 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002436 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002437
2438 if not parsed_issue_arg.patchset:
2439 # Use current revision by default.
2440 revision_info = detail['revisions'][detail['current_revision']]
2441 patchset = int(revision_info['_number'])
2442 else:
2443 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002444 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002445 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2446 break
2447 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002448 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002449 (parsed_issue_arg.patchset, self.GetIssue()))
2450
Edward Lemur125d60a2019-09-13 18:25:41 +00002451 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002452 if remote_url.endswith('.git'):
2453 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002454 remote_url = remote_url.rstrip('/')
2455
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002456 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002457 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002458
2459 if remote_url != fetch_info['url']:
2460 DieWithError('Trying to patch a change from %s but this repo appears '
2461 'to be %s.' % (fetch_info['url'], remote_url))
2462
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002463 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002464
Joanna Wangc023a632023-01-26 17:59:25 +00002465 # Set issue immediately in case the cherry-pick fails, which happens
2466 # when resolving conflicts.
2467 if self.GetBranch():
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00002468 self.SetIssue(parsed_issue_arg.issue)
2469
Aaron Gable62619a32017-06-16 08:22:09 -07002470 if force:
2471 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2472 print('Checked out commit for change %i patchset %i locally' %
2473 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002474 elif nocommit:
2475 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2476 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002477 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002478 RunGit(['cherry-pick', 'FETCH_HEAD'])
2479 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002480 (parsed_issue_arg.issue, patchset))
2481 print('Note: this created a local commit which does not have '
2482 'the same hash as the one uploaded for review. This will make '
2483 'uploading changes based on top of this branch difficult.\n'
2484 'If you want to do that, use "git cl patch --force" instead.')
2485
Stefan Zagerd08043c2017-10-12 12:07:02 -07002486 if self.GetBranch():
Stefan Zagerd08043c2017-10-12 12:07:02 -07002487 self.SetPatchset(patchset)
Edward Lesmes50da7702020-03-30 19:23:43 +00002488 fetched_hash = scm.GIT.ResolveCommit(settings.GetRoot(), 'FETCH_HEAD')
Gavin Makbe2e9262022-11-08 23:41:55 +00002489 self._GitSetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY, fetched_hash)
2490 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, fetched_hash)
Stefan Zagerd08043c2017-10-12 12:07:02 -07002491 else:
2492 print('WARNING: You are in detached HEAD state.\n'
2493 'The patch has been applied to your checkout, but you will not be '
2494 'able to upload a new patch set to the gerrit issue.\n'
2495 'Try using the \'-b\' option if you would like to work on a '
2496 'branch and/or upload a new patch set.')
2497
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002498 return 0
2499
Joanna Wang18de1f62023-01-21 01:24:24 +00002500 @staticmethod
2501 def _GerritCommitMsgHookCheck(offer_removal):
2502 # type: (bool) -> None
2503 """Checks for the gerrit's commit-msg hook and removes it if necessary."""
tandrii16e0b4e2016-06-07 10:34:28 -07002504 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2505 if not os.path.exists(hook):
2506 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002507 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2508 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002509 data = gclient_utils.FileRead(hook)
2510 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2511 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002512 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002513 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002514 'and may interfere with it in subtle ways.\n'
2515 'We recommend you remove the commit-msg hook.')
2516 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002517 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002518 gclient_utils.rm_file_or_tree(hook)
2519 print('Gerrit commit-msg hook removed.')
2520 else:
2521 print('OK, will keep Gerrit commit-msg hook in place.')
2522
Edward Lemur1b52d872019-05-09 21:12:12 +00002523 def _CleanUpOldTraces(self):
2524 """Keep only the last |MAX_TRACES| traces."""
2525 try:
2526 traces = sorted([
2527 os.path.join(TRACES_DIR, f)
2528 for f in os.listdir(TRACES_DIR)
2529 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2530 and not f.startswith('tmp'))
2531 ])
2532 traces_to_delete = traces[:-MAX_TRACES]
2533 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002534 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002535 except OSError:
2536 print('WARNING: Failed to remove old git traces from\n'
2537 ' %s'
2538 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002539
Edward Lemur5737f022019-05-17 01:24:00 +00002540 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002541 """Zip and write the git push traces stored in traces_dir."""
2542 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002543 traces_zip = trace_name + '-traces'
2544 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002545 # Create a temporary dir to store git config and gitcookies in. It will be
2546 # compressed and stored next to the traces.
2547 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002548 git_info_zip = trace_name + '-git-info'
2549
Josip Sokcevic5e18b602020-04-23 21:47:00 +00002550 git_push_metadata['now'] = datetime_now().strftime('%Y-%m-%dT%H:%M:%S.%f')
sangwoo.ko7a614332019-05-22 02:46:19 +00002551
Edward Lemur1b52d872019-05-09 21:12:12 +00002552 git_push_metadata['trace_name'] = trace_name
2553 gclient_utils.FileWrite(
2554 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2555
2556 # Keep only the first 6 characters of the git hashes on the packet
2557 # trace. This greatly decreases size after compression.
2558 packet_traces = os.path.join(traces_dir, 'trace-packet')
2559 if os.path.isfile(packet_traces):
2560 contents = gclient_utils.FileRead(packet_traces)
2561 gclient_utils.FileWrite(
2562 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2563 shutil.make_archive(traces_zip, 'zip', traces_dir)
2564
2565 # Collect and compress the git config and gitcookies.
2566 git_config = RunGit(['config', '-l'])
2567 gclient_utils.FileWrite(
2568 os.path.join(git_info_dir, 'git-config'),
2569 git_config)
2570
2571 cookie_auth = gerrit_util.Authenticator.get()
2572 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2573 gitcookies_path = cookie_auth.get_gitcookies_path()
2574 if os.path.isfile(gitcookies_path):
2575 gitcookies = gclient_utils.FileRead(gitcookies_path)
2576 gclient_utils.FileWrite(
2577 os.path.join(git_info_dir, 'gitcookies'),
2578 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2579 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2580
Edward Lemur1b52d872019-05-09 21:12:12 +00002581 gclient_utils.rmtree(git_info_dir)
2582
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002583 def _RunGitPushWithTraces(self,
2584 refspec,
2585 refspec_opts,
2586 git_push_metadata,
2587 git_push_options=None):
Edward Lemur1b52d872019-05-09 21:12:12 +00002588 """Run git push and collect the traces resulting from the execution."""
2589 # Create a temporary directory to store traces in. Traces will be compressed
2590 # and stored in a 'traces' dir inside depot_tools.
2591 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002592 trace_name = os.path.join(
2593 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002594
2595 env = os.environ.copy()
2596 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2597 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002598 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002599 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2600 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2601 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2602
2603 try:
2604 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002605 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002606 before_push = time_time()
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002607 push_cmd = ['git', 'push', remote_url, refspec]
2608 if git_push_options:
2609 for opt in git_push_options:
2610 push_cmd.extend(['-o', opt])
2611
Edward Lemur0f58ae42019-04-30 17:24:12 +00002612 push_stdout = gclient_utils.CheckCallAndFilter(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002613 push_cmd,
Edward Lemur0f58ae42019-04-30 17:24:12 +00002614 env=env,
2615 print_stdout=True,
2616 # Flush after every line: useful for seeing progress when running as
2617 # recipe.
2618 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002619 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002620 except subprocess2.CalledProcessError as e:
2621 push_returncode = e.returncode
Aravind Vasudevanc9508582022-10-18 03:07:41 +00002622 if 'blocked keyword' in str(e.stdout) or 'banned word' in str(e.stdout):
Josip Sokcevic740825e2021-05-12 18:28:34 +00002623 raise GitPushError(
2624 'Failed to create a change, very likely due to blocked keyword. '
2625 'Please examine output above for the reason of the failure.\n'
2626 'If this is a false positive, you can try to bypass blocked '
2627 'keyword by using push option '
Aravind Vasudevana9a050c2023-03-10 23:09:55 +00002628 '-o banned-words~skip, e.g.:\n'
2629 'git cl upload -o banned-words~skip\n\n'
Josip Sokcevic740825e2021-05-12 18:28:34 +00002630 'If git-cl is not working correctly, file a bug under the '
2631 'Infra>SDK component.')
Josip Sokcevic54e30e72022-02-10 22:32:24 +00002632 if 'git push -o nokeycheck' in str(e.stdout):
2633 raise GitPushError(
2634 'Failed to create a change, very likely due to a private key being '
2635 'detected. Please examine output above for the reason of the '
2636 'failure.\n'
2637 'If this is a false positive, you can try to bypass private key '
2638 'detection by using push option '
2639 '-o nokeycheck, e.g.:\n'
2640 'git cl upload -o nokeycheck\n\n'
2641 'If git-cl is not working correctly, file a bug under the '
2642 'Infra>SDK component.')
Josip Sokcevic740825e2021-05-12 18:28:34 +00002643
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002644 raise GitPushError(
2645 'Failed to create a change. Please examine output above for the '
2646 'reason of the failure.\n'
Josip Sokcevic7386a1e2021-02-12 19:00:34 +00002647 'For emergencies, Googlers can escalate to '
2648 'go/gob-support or go/notify#gob\n'
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002649 'Hint: run command below to diagnose common Git/Gerrit '
2650 'credential problems:\n'
2651 ' git cl creds-check\n'
2652 '\n'
2653 'If git-cl is not working correctly, file a bug under the Infra>SDK '
2654 'component including the files below.\n'
2655 'Review the files before upload, since they might contain sensitive '
2656 'information.\n'
2657 'Set the Restrict-View-Google label so that they are not publicly '
2658 'accessible.\n' + TRACES_MESSAGE % {'trace_name': trace_name})
Edward Lemur0f58ae42019-04-30 17:24:12 +00002659 finally:
2660 execution_time = time_time() - before_push
2661 metrics.collector.add_repeated('sub_commands', {
2662 'command': 'git push',
2663 'execution_time': execution_time,
2664 'exit_code': push_returncode,
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002665 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
Edward Lemur0f58ae42019-04-30 17:24:12 +00002666 })
2667
Edward Lemur1b52d872019-05-09 21:12:12 +00002668 git_push_metadata['execution_time'] = execution_time
2669 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002670 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002671
Edward Lemur1b52d872019-05-09 21:12:12 +00002672 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002673 gclient_utils.rmtree(traces_dir)
2674
2675 return push_stdout
2676
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002677 def CMDUploadChange(self, options, git_diff_args, custom_cl_base,
2678 change_desc):
2679 """Upload the current branch to Gerrit, retry if new remote HEAD is
2680 found. options and change_desc may be mutated."""
Josip Sokcevicb631a882021-01-06 18:18:10 +00002681 remote, remote_branch = self.GetRemoteBranch()
2682 branch = GetTargetRef(remote, remote_branch, options.target_branch)
2683
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002684 try:
2685 return self._CMDUploadChange(options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002686 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002687 except GitPushError as e:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002688 # Repository might be in the middle of transition to main branch as
2689 # default, and uploads to old default might be blocked.
2690 if remote_branch not in [DEFAULT_OLD_BRANCH, DEFAULT_NEW_BRANCH]:
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002691 DieWithError(str(e), change_desc)
2692
Josip Sokcevicb631a882021-01-06 18:18:10 +00002693 project_head = gerrit_util.GetProjectHead(self._gerrit_host,
2694 self.GetGerritProject())
2695 if project_head == branch:
2696 DieWithError(str(e), change_desc)
2697 branch = project_head
2698
2699 print("WARNING: Fetching remote state and retrying upload to default "
2700 "branch...")
2701 RunGit(['fetch', '--prune', remote])
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002702 options.edit_description = False
2703 options.force = True
2704 try:
Josip Sokcevicb631a882021-01-06 18:18:10 +00002705 self._CMDUploadChange(options, git_diff_args, custom_cl_base,
2706 change_desc, branch)
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002707 except GitPushError as e:
2708 DieWithError(str(e), change_desc)
2709
2710 def _CMDUploadChange(self, options, git_diff_args, custom_cl_base,
Josip Sokcevicb631a882021-01-06 18:18:10 +00002711 change_desc, branch):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002712 """Upload the current branch to Gerrit."""
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002713 if options.squash:
Joanna Wangc4ac3022023-01-31 21:19:57 +00002714 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002715 external_parent = None
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002716 if self.GetIssue():
Josipe827b0f2020-01-30 00:07:20 +00002717 # User requested to change description
2718 if options.edit_description:
Josipe827b0f2020-01-30 00:07:20 +00002719 change_desc.prompt()
Gavin Mak4e5e3992022-11-14 22:40:12 +00002720 change_detail = self._GetChangeDetail(['CURRENT_REVISION'])
2721 change_id = change_detail['change_id']
Edward Lemur5a644f82020-03-18 16:44:57 +00002722 change_desc.ensure_change_id(change_id)
Gavin Mak4e5e3992022-11-14 22:40:12 +00002723
2724 # Check if changes outside of this workspace have been uploaded.
2725 current_rev = change_detail['current_revision']
2726 last_uploaded_rev = self._GitGetBranchConfigValue(
2727 GERRIT_SQUASH_HASH_CONFIG_KEY)
2728 if last_uploaded_rev and current_rev != last_uploaded_rev:
2729 external_parent = self._UpdateWithExternalChanges()
Aaron Gableb56ad332017-01-06 15:24:31 -08002730 else: # if not self.GetIssue()
Gavin Mak68e6cf32021-01-25 18:24:08 +00002731 if not options.force and not options.message_file:
Anthony Polito8b955342019-09-24 19:01:36 +00002732 change_desc.prompt()
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002733 change_ids = git_footers.get_footer_change_id(change_desc.description)
Edward Lemur5a644f82020-03-18 16:44:57 +00002734 if len(change_ids) == 1:
2735 change_id = change_ids[0]
2736 else:
2737 change_id = GenerateGerritChangeId(change_desc.description)
2738 change_desc.ensure_change_id(change_id)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002739
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002740 if options.preserve_tryjobs:
2741 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002742
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002743 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Gavin Mak4e5e3992022-11-14 22:40:12 +00002744 parent = external_parent or self._ComputeParent(
Edward Lemur5a644f82020-03-18 16:44:57 +00002745 remote, upstream_branch, custom_cl_base, options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lemur1773f372020-02-22 00:27:14 +00002747 with gclient_utils.temporary_file() as desc_tempfile:
2748 gclient_utils.FileWrite(desc_tempfile, change_desc.description)
2749 ref_to_push = RunGit(
2750 ['commit-tree', tree, '-p', parent, '-F', desc_tempfile]).strip()
Anthony Polito8b955342019-09-24 19:01:36 +00002751 else: # if not options.squash
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002752 if options.no_add_changeid:
2753 pass
2754 else: # adding Change-Ids is okay.
2755 if not git_footers.get_footer_change_id(change_desc.description):
2756 DownloadGerritHook(False)
2757 change_desc.set_description(
2758 self._AddChangeIdToCommitMessage(change_desc.description,
2759 git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002760 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002761 # For no-squash mode, we assume the remote called "origin" is the one we
2762 # want. It is not worthwhile to support different workflows for
2763 # no-squash mode.
2764 parent = 'origin/%s' % branch
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00002765 # attempt to extract the changeid from the current description
2766 # fail informatively if not possible.
2767 change_id_candidates = git_footers.get_footer_change_id(
2768 change_desc.description)
2769 if not change_id_candidates:
2770 DieWithError("Unable to extract change-id from message.")
2771 change_id = change_id_candidates[0]
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002772
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002773 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002774 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2775 ref_to_push)]).splitlines()
2776 if len(commits) > 1:
2777 print('WARNING: This will upload %d commits. Run the following command '
2778 'to see which commits will be uploaded: ' % len(commits))
2779 print('git log %s..%s' % (parent, ref_to_push))
2780 print('You can also use `git squash-branch` to squash these into a '
2781 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002782 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002783
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002784 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002785 cc = []
Joanna Wangc4ac3022023-01-31 21:19:57 +00002786 # Add default, watchlist, presubmit ccs if this is the initial upload
2787 # and CL is not private and auto-ccing has not been disabled.
2788 if not options.private and not options.no_autocc and not self.GetIssue():
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002789 cc = self.GetCCList().split(',')
Gavin Makb1c08f62021-04-01 18:05:58 +00002790 if len(cc) > 100:
2791 lsc = ('https://chromium.googlesource.com/chromium/src/+/HEAD/docs/'
2792 'process/lsc/lsc_workflow.md')
2793 print('WARNING: This will auto-CC %s users.' % len(cc))
2794 print('LSC may be more appropriate: %s' % lsc)
2795 print('You can also use the --no-autocc flag to disable auto-CC.')
2796 confirm_or_exit(action='continue')
Edward Lemur4508b422019-10-03 21:56:35 +00002797 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002798 if options.cc:
2799 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002800 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002801 if change_desc.get_cced():
2802 cc.extend(change_desc.get_cced())
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002803 if self.GetGerritHost() == 'chromium-review.googlesource.com':
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002804 valid_accounts = set(reviewers + cc)
2805 # TODO(crbug/877717): relax this for all hosts.
2806 else:
2807 valid_accounts = gerrit_util.ValidAccounts(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002808 self.GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002809 logging.info('accounts %s are recognized, %s invalid',
2810 sorted(valid_accounts),
2811 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002812
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002813 # Extra options that can be specified at push time. Doc:
2814 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Joanna Wanga1abbed2023-01-24 01:41:05 +00002815 refspec_opts = self._GetRefSpecOptions(options, change_desc)
agablec6787972016-09-09 16:13:34 -07002816
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002817 for r in sorted(reviewers):
2818 if r in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002819 refspec_opts.append('r=%s' % r)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002820 reviewers.remove(r)
2821 else:
2822 # TODO(tandrii): this should probably be a hard failure.
2823 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2824 % r)
2825 for c in sorted(cc):
2826 # refspec option will be rejected if cc doesn't correspond to an
2827 # account, even though REST call to add such arbitrary cc may succeed.
2828 if c in valid_accounts:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002829 refspec_opts.append('cc=%s' % c)
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002830 cc.remove(c)
2831
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002832 refspec_suffix = ''
2833 if refspec_opts:
2834 refspec_suffix = '%' + ','.join(refspec_opts)
2835 assert ' ' not in refspec_suffix, (
2836 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2837 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002838
Edward Lemur1b52d872019-05-09 21:12:12 +00002839 git_push_metadata = {
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002840 'gerrit_host': self.GetGerritHost(),
Josip Sokcevicf736cab2020-10-20 23:41:38 +00002841 'title': options.title or '<untitled>',
Edward Lemur1b52d872019-05-09 21:12:12 +00002842 'change_id': change_id,
2843 'description': change_desc.description,
2844 }
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002845
Gavin Mak4e5e3992022-11-14 22:40:12 +00002846 # Gerrit may or may not update fast enough to return the correct patchset
2847 # number after we push. Get the pre-upload patchset and increment later.
2848 latest_ps = self.GetMostRecentPatchset(update=False) or 0
2849
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +00002850 push_stdout = self._RunGitPushWithTraces(refspec, refspec_opts,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00002851 git_push_metadata,
2852 options.push_options)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002853
2854 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002855 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002856 change_numbers = [m.group(1)
2857 for m in map(regex.match, push_stdout.splitlines())
2858 if m]
2859 if len(change_numbers) != 1:
2860 DieWithError(
2861 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002862 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002863 self.SetIssue(change_numbers[0])
Gavin Mak4e5e3992022-11-14 22:40:12 +00002864 self.SetPatchset(latest_ps + 1)
Gavin Makbe2e9262022-11-08 23:41:55 +00002865 self._GitSetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY, ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002866
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002867 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002868 # GetIssue() is not set in case of non-squash uploads according to tests.
Aaron Gable6e7ddb62020-05-27 22:23:29 +00002869 # TODO(crbug.com/751901): non-squash uploads in git cl should be removed.
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00002870 gerrit_util.AddReviewers(self.GetGerritHost(),
2871 self._GerritChangeIdentifier(),
2872 reviewers,
2873 cc,
2874 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002875
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876 return 0
2877
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002878 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2879 change_desc):
2880 """Computes parent of the generated commit to be uploaded to Gerrit.
2881
2882 Returns revision or a ref name.
2883 """
2884 if custom_cl_base:
2885 # Try to avoid creating additional unintended CLs when uploading, unless
2886 # user wants to take this risk.
2887 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2888 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2889 local_ref_of_target_remote])
2890 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002891 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002892 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2893 'If you proceed with upload, more than 1 CL may be created by '
2894 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2895 'If you are certain that specified base `%s` has already been '
2896 'uploaded to Gerrit as another CL, you may proceed.\n' %
2897 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2898 if not force:
2899 confirm_or_exit(
2900 'Do you take responsibility for cleaning up potential mess '
2901 'resulting from proceeding with upload?',
2902 action='upload')
2903 return custom_cl_base
2904
Aaron Gablef97e33d2017-03-30 15:44:27 -07002905 if remote != '.':
2906 return self.GetCommonAncestorWithUpstream()
2907
2908 # If our upstream branch is local, we base our squashed commit on its
2909 # squashed version.
2910 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2911
Aaron Gablef97e33d2017-03-30 15:44:27 -07002912 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002913 return self.GetCommonAncestorWithUpstream()
Glen Robertson7d98e222020-08-27 17:53:11 +00002914 if upstream_branch_name == 'main':
2915 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002916
2917 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002918 # TODO(tandrii): consider checking parent change in Gerrit and using its
2919 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2920 # the tree hash of the parent branch. The upside is less likely bogus
2921 # requests to reupload parent change just because it's uploadhash is
2922 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Gavin Makbe2e9262022-11-08 23:41:55 +00002923 parent = scm.GIT.GetBranchConfig(settings.GetRoot(), upstream_branch_name,
2924 GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablef97e33d2017-03-30 15:44:27 -07002925 # Verify that the upstream branch has been uploaded too, otherwise
2926 # Gerrit will create additional CLs when uploading.
2927 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2928 RunGitSilent(['rev-parse', parent + ':'])):
2929 DieWithError(
2930 '\nUpload upstream branch %s first.\n'
2931 'It is likely that this branch has been rebased since its last '
2932 'upload, so you just need to upload it again.\n'
2933 '(If you uploaded it with --no-squash, then branch dependencies '
2934 'are not supported, and you should reupload with --squash.)'
2935 % upstream_branch_name,
2936 change_desc)
2937 return parent
2938
Gavin Mak4e5e3992022-11-14 22:40:12 +00002939 def _UpdateWithExternalChanges(self):
2940 """Updates workspace with external changes.
2941
2942 Returns the commit hash that should be used as the merge base on upload.
2943 """
2944 local_ps = self.GetPatchset()
2945 if local_ps is None:
2946 return
2947
2948 external_ps = self.GetMostRecentPatchset(update=False)
Gavin Makf35a9eb2022-11-17 18:34:36 +00002949 if external_ps is None or local_ps == external_ps or \
2950 not self._IsPatchsetRangeSignificant(local_ps + 1, external_ps):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002951 return
2952
2953 num_changes = external_ps - local_ps
Gavin Mak6f905472023-01-06 21:01:36 +00002954 if num_changes > 1:
2955 change_words = 'changes were'
2956 else:
2957 change_words = 'change was'
2958 print('\n%d external %s published to %s:\n' %
2959 (num_changes, change_words, self.GetIssueURL(short=True)))
2960
2961 # Print an overview of external changes.
2962 ps_to_commit = {}
2963 ps_to_info = {}
2964 revisions = self._GetChangeDetail(['ALL_REVISIONS'])
2965 for commit_id, revision_info in revisions.get('revisions', {}).items():
2966 ps_num = revision_info['_number']
2967 ps_to_commit[ps_num] = commit_id
2968 ps_to_info[ps_num] = revision_info
2969
2970 for ps in range(external_ps, local_ps, -1):
2971 commit = ps_to_commit[ps][:8]
2972 desc = ps_to_info[ps].get('description', '')
2973 print('Patchset %d [%s] %s' % (ps, commit, desc))
2974
2975 if not ask_for_explicit_yes('\nUploading as-is will override them. '
2976 'Get the latest changes and apply?'):
Gavin Mak4e5e3992022-11-14 22:40:12 +00002977 return
2978
2979 # Get latest Gerrit merge base. Use the first parent even if multiple exist.
2980 external_parent = self._GetChangeCommit(revision=external_ps)['parents'][0]
2981 external_base = external_parent['commit']
2982
2983 branch = git_common.current_branch()
2984 local_base = self.GetCommonAncestorWithUpstream()
2985 if local_base != external_base:
2986 print('\nLocal merge base %s is different from Gerrit %s.\n' %
2987 (local_base, external_base))
2988 if git_common.upstream(branch):
mark a. foltzbcb95772023-05-05 17:28:26 +00002989 confirm_or_exit('Can\'t apply the latest changes from Gerrit.\n'
2990 'Continue with upload and override the latest changes?')
2991 return
2992 print('No upstream branch set. Continuing upload with Gerrit merge base.')
Gavin Mak4e5e3992022-11-14 22:40:12 +00002993
2994 # Fetch Gerrit's CL base if it doesn't exist locally.
2995 remote, _ = self.GetRemoteBranch()
2996 if not scm.GIT.IsValidRevision(settings.GetRoot(), external_base):
2997 RunGitSilent(['fetch', remote, external_base])
2998
2999 # Get the diff between local_ps and external_ps.
3000 issue = self.GetIssue()
Gavin Mak591ebaf2022-12-06 18:05:07 +00003001 changes_ref = 'refs/changes/%02d/%d/' % (issue % 100, issue)
Gavin Mak4e5e3992022-11-14 22:40:12 +00003002 RunGitSilent(['fetch', remote, changes_ref + str(local_ps)])
3003 last_uploaded = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3004 RunGitSilent(['fetch', remote, changes_ref + str(external_ps)])
3005 latest_external = RunGitSilent(['rev-parse', 'FETCH_HEAD']).strip()
3006 diff = RunGitSilent(['diff', '%s..%s' % (last_uploaded, latest_external)])
3007
3008 # Diff can be empty in the case of trivial rebases.
3009 if not diff:
3010 return external_base
3011
3012 # Apply the diff.
3013 with gclient_utils.temporary_file() as diff_tempfile:
3014 gclient_utils.FileWrite(diff_tempfile, diff)
3015 clean_patch = RunGitWithCode(['apply', '--check', diff_tempfile])[0] == 0
3016 RunGitSilent(['apply', '-3', '--intent-to-add', diff_tempfile])
3017 if not clean_patch:
3018 # Normally patchset is set after upload. But because we exit, that never
3019 # happens. Updating here makes sure that subsequent uploads don't need
3020 # to fetch/apply the same diff again.
3021 self.SetPatchset(external_ps)
3022 DieWithError('\nPatch did not apply cleanly. Please resolve any '
3023 'conflicts and reupload.')
3024
3025 message = 'Incorporate external changes from '
3026 if num_changes == 1:
3027 message += 'patchset %d' % external_ps
3028 else:
3029 message += 'patchsets %d to %d' % (local_ps + 1, external_ps)
3030 RunGitSilent(['commit', '-am', message])
3031 # TODO(crbug.com/1382528): Use the previous commit's message as a default
3032 # patchset title instead of this 'Incorporate' message.
3033 return external_base
3034
Edward Lemura12175c2020-03-09 16:58:26 +00003035 def _AddChangeIdToCommitMessage(self, log_desc, args):
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003036 """Re-commits using the current message, assumes the commit hook is in
3037 place.
3038 """
Edward Lemura12175c2020-03-09 16:58:26 +00003039 RunGit(['commit', '--amend', '-m', log_desc])
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003040 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003041 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003042 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003043 return new_log_desc
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003044
3045 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003046
tandriie113dfd2016-10-11 10:20:12 -07003047 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003048 try:
3049 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003050 except GerritChangeNotExists:
3051 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003052
3053 if data['status'] in ('ABANDONED', 'MERGED'):
3054 return 'CL %s is closed' % self.GetIssue()
3055
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003056 def GetGerritChange(self, patchset=None):
3057 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00003058 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003059 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00003060 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003061 data = self._GetChangeDetail(['ALL_REVISIONS'])
3062
3063 assert host and issue and patchset, 'CL must be uploaded first'
3064
3065 has_patchset = any(
3066 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003067 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003068 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08003069 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003070 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003071
tandrii8c5a3532016-11-04 07:52:02 -07003072 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00003073 'host': host,
3074 'change': issue,
3075 'project': data['project'],
3076 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07003077 }
tandriie113dfd2016-10-11 10:20:12 -07003078
tandriide281ae2016-10-12 06:02:30 -07003079 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003080 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003081
Edward Lemur707d70b2018-02-07 00:50:14 +01003082 def GetReviewers(self):
3083 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00003084 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01003085
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003086
Lei Zhang8a0efc12020-08-05 19:58:45 +00003087def _get_bug_line_values(default_project_prefix, bugs):
3088 """Given default_project_prefix and comma separated list of bugs, yields bug
3089 line values.
tandriif9aefb72016-07-01 09:06:51 -07003090
3091 Each bug can be either:
Lei Zhang8a0efc12020-08-05 19:58:45 +00003092 * a number, which is combined with default_project_prefix
tandriif9aefb72016-07-01 09:06:51 -07003093 * string, which is left as is.
3094
3095 This function may produce more than one line, because bugdroid expects one
3096 project per line.
3097
Lei Zhang8a0efc12020-08-05 19:58:45 +00003098 >>> list(_get_bug_line_values('v8:', '123,chromium:789'))
tandriif9aefb72016-07-01 09:06:51 -07003099 ['v8:123', 'chromium:789']
3100 """
3101 default_bugs = []
3102 others = []
3103 for bug in bugs.split(','):
3104 bug = bug.strip()
3105 if bug:
3106 try:
3107 default_bugs.append(int(bug))
3108 except ValueError:
3109 others.append(bug)
3110
3111 if default_bugs:
3112 default_bugs = ','.join(map(str, default_bugs))
Lei Zhang8a0efc12020-08-05 19:58:45 +00003113 if default_project_prefix:
3114 if not default_project_prefix.endswith(':'):
3115 default_project_prefix += ':'
3116 yield '%s%s' % (default_project_prefix, default_bugs)
tandriif9aefb72016-07-01 09:06:51 -07003117 else:
3118 yield default_bugs
3119 for other in sorted(others):
3120 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3121 yield other
3122
3123
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003124class ChangeDescription(object):
3125 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003126 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003127 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003128 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00003129 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003130 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003131 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3132 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00003133 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003134 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003135
Dan Beamd8b04ca2019-10-10 21:23:26 +00003136 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003137 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00003138 if bug:
3139 regexp = re.compile(self.BUG_LINE)
3140 prefix = settings.GetBugPrefix()
3141 if not any((regexp.match(line) for line in self._description_lines)):
3142 values = list(_get_bug_line_values(prefix, bug))
3143 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00003144 if fixed:
3145 regexp = re.compile(self.FIXED_LINE)
3146 prefix = settings.GetBugPrefix()
3147 if not any((regexp.match(line) for line in self._description_lines)):
3148 values = list(_get_bug_line_values(prefix, fixed))
3149 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003150
agable@chromium.org42c20792013-09-12 17:34:49 +00003151 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003152 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003153 return '\n'.join(self._description_lines)
3154
3155 def set_description(self, desc):
3156 if isinstance(desc, basestring):
3157 lines = desc.splitlines()
3158 else:
3159 lines = [line.rstrip() for line in desc]
3160 while lines and not lines[0]:
3161 lines.pop(0)
3162 while lines and not lines[-1]:
3163 lines.pop(-1)
3164 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003165
Edward Lemur5a644f82020-03-18 16:44:57 +00003166 def ensure_change_id(self, change_id):
3167 description = self.description
3168 footer_change_ids = git_footers.get_footer_change_id(description)
3169 # Make sure that the Change-Id in the description matches the given one.
3170 if footer_change_ids != [change_id]:
3171 if footer_change_ids:
3172 # Remove any existing Change-Id footers since they don't match the
3173 # expected change_id footer.
3174 description = git_footers.remove_footer(description, 'Change-Id')
3175 print('WARNING: Change-Id has been set to %s. Use `git cl issue 0` '
3176 'if you want to set a new one.')
3177 # Add the expected Change-Id footer.
3178 description = git_footers.add_footer_change_id(description, change_id)
3179 self.set_description(description)
3180
Joanna Wang39811b12023-01-20 23:09:48 +00003181 def update_reviewers(self, reviewers):
3182 """Rewrites the R= line(s) as a single line each.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003183
3184 Args:
3185 reviewers (list(str)) - list of additional emails to use for reviewers.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003186 """
Joanna Wang39811b12023-01-20 23:09:48 +00003187 if not reviewers:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003188 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003189
3190 reviewers = set(reviewers)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003191
Joanna Wang39811b12023-01-20 23:09:48 +00003192 # Get the set of R= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003193 regexp = re.compile(self.R_LINE)
3194 matches = [regexp.match(line) for line in self._description_lines]
3195 new_desc = [l for i, l in enumerate(self._description_lines)
3196 if not matches[i]]
3197 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003198
Joanna Wang39811b12023-01-20 23:09:48 +00003199 # Construct new unified R= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003200
Joanna Wang39811b12023-01-20 23:09:48 +00003201 # First, update reviewers with names from the R= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003202 for match in matches:
3203 if not match:
3204 continue
Joanna Wang39811b12023-01-20 23:09:48 +00003205 reviewers.update(cleanup_list([match.group(2).strip()]))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003206
Joanna Wang39811b12023-01-20 23:09:48 +00003207 new_r_line = 'R=' + ', '.join(sorted(reviewers))
agable@chromium.org42c20792013-09-12 17:34:49 +00003208
3209 # Put the new lines in the description where the old first R= line was.
3210 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3211 if 0 <= line_loc < len(self._description_lines):
Joanna Wang39811b12023-01-20 23:09:48 +00003212 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003213 else:
Joanna Wang39811b12023-01-20 23:09:48 +00003214 self.append_footer(new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003215
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00003216 def set_preserve_tryjobs(self):
3217 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
3218 footers = git_footers.parse_footers(self.description)
3219 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
3220 if v.lower() == 'true':
3221 return
3222 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
3223
Anthony Polito8b955342019-09-24 19:01:36 +00003224 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003225 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003226 self.set_description([
3227 '# Enter a description of the change.',
3228 '# This will be displayed on the codereview site.',
3229 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003230 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003231 '--------------------',
3232 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00003233 bug_regexp = re.compile(self.BUG_LINE)
3234 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00003235 prefix = settings.GetBugPrefix()
Sigurd Schneider8630bb12020-11-11 14:02:49 +00003236 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003237
Dan Beamd8b04ca2019-10-10 21:23:26 +00003238 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00003239 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07003240
Bruce Dawsonfc487042020-10-27 19:11:37 +00003241 print('Waiting for editor...')
agable@chromium.org42c20792013-09-12 17:34:49 +00003242 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00003243 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003244 if not content:
3245 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003246 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003247
Bruce Dawson2377b012018-01-11 16:46:49 -08003248 # Strip off comments and default inserted "Bug:" line.
3249 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00003250 (line.startswith('#') or
3251 line.rstrip() == "Bug:" or
3252 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00003253 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003254 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003255 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003256
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003257 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003258 """Adds a footer line to the description.
3259
3260 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3261 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3262 that Gerrit footers are always at the end.
3263 """
3264 parsed_footer_line = git_footers.parse_footer(line)
3265 if parsed_footer_line:
3266 # Line is a gerrit footer in the form: Footer-Key: any value.
3267 # Thus, must be appended observing Gerrit footer rules.
3268 self.set_description(
3269 git_footers.add_footer(self.description,
3270 key=parsed_footer_line[0],
3271 value=parsed_footer_line[1]))
3272 return
3273
3274 if not self._description_lines:
3275 self._description_lines.append(line)
3276 return
3277
3278 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3279 if gerrit_footers:
3280 # git_footers.split_footers ensures that there is an empty line before
3281 # actual (gerrit) footers, if any. We have to keep it that way.
3282 assert top_lines and top_lines[-1] == ''
3283 top_lines, separator = top_lines[:-1], top_lines[-1:]
3284 else:
3285 separator = [] # No need for separator if there are no gerrit_footers.
3286
3287 prev_line = top_lines[-1] if top_lines else ''
Josip Sokcevic7958e302023-03-01 23:02:21 +00003288 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3289 not presubmit_support.Change.TAG_LINE_RE.match(line)):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003290 top_lines.append('')
3291 top_lines.append(line)
3292 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003293
tandrii99a72f22016-08-17 14:33:24 -07003294 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003295 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003296 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003297 reviewers = [match.group(2).strip()
3298 for match in matches
3299 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003300 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003301
bradnelsond975b302016-10-23 12:20:23 -07003302 def get_cced(self):
3303 """Retrieves the list of reviewers."""
3304 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3305 cced = [match.group(2).strip() for match in matches if match]
3306 return cleanup_list(cced)
3307
Nodir Turakulov23b82142017-11-16 11:04:25 -08003308 def get_hash_tags(self):
3309 """Extracts and sanitizes a list of Gerrit hashtags."""
3310 subject = (self._description_lines or ('',))[0]
3311 subject = re.sub(
3312 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3313
3314 tags = []
3315 start = 0
3316 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3317 while True:
3318 m = bracket_exp.match(subject, start)
3319 if not m:
3320 break
3321 tags.append(self.sanitize_hash_tag(m.group(1)))
3322 start = m.end()
3323
3324 if not tags:
3325 # Try "Tag: " prefix.
3326 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3327 if m:
3328 tags.append(self.sanitize_hash_tag(m.group(1)))
3329 return tags
3330
3331 @classmethod
3332 def sanitize_hash_tag(cls, tag):
3333 """Returns a sanitized Gerrit hash tag.
3334
3335 A sanitized hashtag can be used as a git push refspec parameter value.
3336 """
3337 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3338
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003339
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003340def FindCodereviewSettingsFile(filename='codereview.settings'):
3341 """Finds the given file starting in the cwd and going up.
3342
3343 Only looks up to the top of the repository unless an
3344 'inherit-review-settings-ok' file exists in the root of the repository.
3345 """
3346 inherit_ok_file = 'inherit-review-settings-ok'
3347 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003348 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003349 if os.path.isfile(os.path.join(root, inherit_ok_file)):
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003350 root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003351 while True:
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003352 if os.path.isfile(os.path.join(cwd, filename)):
3353 return open(os.path.join(cwd, filename))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003354 if cwd == root:
3355 break
Aleksey Khoroshilov2a229712022-06-02 16:24:11 +00003356 parent_dir = os.path.dirname(cwd)
3357 if parent_dir == cwd:
3358 # We hit the system root directory.
3359 break
3360 cwd = parent_dir
3361 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003362
3363
3364def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003365 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003366 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003367
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003368 def SetProperty(name, setting, unset_error_ok=False):
3369 fullname = 'rietveld.' + name
3370 if setting in keyvals:
3371 RunGit(['config', fullname, keyvals[setting]])
3372 else:
3373 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3374
tandrii48df5812016-10-17 03:55:37 -07003375 if not keyvals.get('GERRIT_HOST', False):
3376 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003377 # Only server setting is required. Other settings can be absent.
3378 # In that case, we ignore errors raised during option deletion attempt.
Joanna Wangc8f23e22023-01-19 21:18:10 +00003379 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3381 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003382 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003383 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3384 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003385 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3386 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003387 SetProperty(
3388 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003389
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003390 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003391 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003392
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003393 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
Edward Lesmes4de54132020-05-05 19:41:33 +00003394 RunGit(['config', 'gerrit.squash-uploads',
3395 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003396
tandrii@chromium.org28253532016-04-14 13:46:56 +00003397 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003398 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003399 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3400
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003401 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003402 # should be of the form
3403 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3404 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003405 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3406 keyvals['ORIGIN_URL_CONFIG']])
3407
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003408
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003409def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003410 """Downloads a network object to a local file, like urllib.urlretrieve.
3411
3412 This is necessary because urllib is broken for SSL connections via a proxy.
3413 """
Vadim Shtayuraf7b8f8f2021-11-15 19:10:05 +00003414 with open(destination, 'wb') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003415 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003416
3417
ukai@chromium.org712d6102013-11-27 00:52:58 +00003418def hasSheBang(fname):
3419 """Checks fname is a #! script."""
3420 with open(fname) as f:
3421 return f.read(2).startswith('#!')
3422
3423
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003424def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003425 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003426
3427 Args:
3428 force: True to update hooks. False to install hooks if not present.
3429 """
ukai@chromium.org712d6102013-11-27 00:52:58 +00003430 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003431 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3432 if not os.access(dst, os.X_OK):
3433 if os.path.exists(dst):
3434 if not force:
3435 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003436 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003437 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003438 if not hasSheBang(dst):
3439 DieWithError('Not a script: %s\n'
3440 'You need to download from\n%s\n'
3441 'into .git/hooks/commit-msg and '
3442 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003443 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3444 except Exception:
3445 if os.path.exists(dst):
3446 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003447 DieWithError('\nFailed to download hooks.\n'
3448 'You need to download from\n%s\n'
3449 'into .git/hooks/commit-msg and '
3450 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003451
3452
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003453class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003454 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003455
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003456 def __init__(self):
3457 # Cached list of [host, identity, source], where source is either
3458 # .gitcookies or .netrc.
3459 self._all_hosts = None
3460
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003461 def ensure_configured_gitcookies(self):
3462 """Runs checks and suggests fixes to make git use .gitcookies from default
3463 path."""
3464 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3465 configured_path = RunGitSilent(
3466 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003467 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003468 if configured_path:
3469 self._ensure_default_gitcookies_path(configured_path, default)
3470 else:
3471 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003472
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003473 @staticmethod
3474 def _ensure_default_gitcookies_path(configured_path, default_path):
3475 assert configured_path
3476 if configured_path == default_path:
3477 print('git is already configured to use your .gitcookies from %s' %
3478 configured_path)
3479 return
3480
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003481 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003482 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3483 (configured_path, default_path))
3484
3485 if not os.path.exists(configured_path):
3486 print('However, your configured .gitcookies file is missing.')
3487 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3488 action='reconfigure')
3489 RunGit(['config', '--global', 'http.cookiefile', default_path])
3490 return
3491
3492 if os.path.exists(default_path):
3493 print('WARNING: default .gitcookies file already exists %s' %
3494 default_path)
3495 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3496 default_path)
3497
3498 confirm_or_exit('Move existing .gitcookies to default location?',
3499 action='move')
3500 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003501 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003502 print('Moved and reconfigured git to use .gitcookies from %s' %
3503 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003504
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003505 @staticmethod
3506 def _configure_gitcookies_path(default_path):
3507 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3508 if os.path.exists(netrc_path):
3509 print('You seem to be using outdated .netrc for git credentials: %s' %
3510 netrc_path)
3511 print('This tool will guide you through setting up recommended '
3512 '.gitcookies store for git credentials.\n'
3513 '\n'
3514 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3515 ' git config --global --unset http.cookiefile\n'
3516 ' mv %s %s.backup\n\n' % (default_path, default_path))
3517 confirm_or_exit(action='setup .gitcookies')
3518 RunGit(['config', '--global', 'http.cookiefile', default_path])
3519 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003520
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003521 def get_hosts_with_creds(self, include_netrc=False):
3522 if self._all_hosts is None:
3523 a = gerrit_util.CookiesAuthenticator()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003524 self._all_hosts = [(h, u, s) for h, u, s in itertools.chain((
3525 (h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()), (
3526 (h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items()))
3527 if h.endswith(_GOOGLESOURCE)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003528
3529 if include_netrc:
3530 return self._all_hosts
3531 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3532
3533 def print_current_creds(self, include_netrc=False):
3534 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3535 if not hosts:
3536 print('No Git/Gerrit credentials found')
3537 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003538 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003539 header = [('Host', 'User', 'Which file'),
3540 ['=' * l for l in lengths]]
3541 for row in (header + hosts):
3542 print('\t'.join((('%%+%ds' % l) % s)
3543 for l, s in zip(lengths, row)))
3544
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003545 @staticmethod
3546 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003547 """Parses identity "git-<username>.domain" into <username> and domain."""
3548 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003549 # distinguishable from sub-domains. But we do know typical domains:
3550 if identity.endswith('.chromium.org'):
3551 domain = 'chromium.org'
3552 username = identity[:-len('.chromium.org')]
3553 else:
3554 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003555 if username.startswith('git-'):
3556 username = username[len('git-'):]
3557 return username, domain
3558
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003559 def has_generic_host(self):
3560 """Returns whether generic .googlesource.com has been configured.
3561
3562 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3563 """
3564 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003565 if host == '.' + _GOOGLESOURCE:
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003566 return True
3567 return False
3568
3569 def _get_git_gerrit_identity_pairs(self):
3570 """Returns map from canonic host to pair of identities (Git, Gerrit).
3571
3572 One of identities might be None, meaning not configured.
3573 """
3574 host_to_identity_pairs = {}
3575 for host, identity, _ in self.get_hosts_with_creds():
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003576 canonical = _canonical_git_googlesource_host(host)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003577 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3578 idx = 0 if canonical == host else 1
3579 pair[idx] = identity
3580 return host_to_identity_pairs
3581
3582 def get_partially_configured_hosts(self):
3583 return set(
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003584 (host if i1 else _canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003585 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003586 if None in (i1, i2) and host != '.' + _GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003587
3588 def get_conflicting_hosts(self):
3589 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003590 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003591 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003592 if None not in (i1, i2) and i1 != i2)
3593
3594 def get_duplicated_hosts(self):
3595 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003596 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003597
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003598
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003599 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003600 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003601 hosts = sorted(hosts)
3602 assert hosts
3603 if extra_column_func is None:
3604 extras = [''] * len(hosts)
3605 else:
3606 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003607 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3608 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003609 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003610 lines.append(tmpl % he)
3611 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003612
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003613 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003614 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003615 yield ('.googlesource.com wildcard record detected',
3616 ['Chrome Infrastructure team recommends to list full host names '
3617 'explicitly.'],
3618 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003619
3620 dups = self.get_duplicated_hosts()
3621 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003622 yield ('The following hosts were defined twice',
3623 self._format_hosts(dups),
3624 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003625
3626 partial = self.get_partially_configured_hosts()
3627 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003628 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3629 'These hosts are missing',
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003630 self._format_hosts(
3631 partial, lambda host: 'but %s defined' % _get_counterpart_host(
3632 host)), partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003633
3634 conflicting = self.get_conflicting_hosts()
3635 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003636 yield ('The following Git hosts have differing credentials from their '
3637 'Gerrit counterparts',
3638 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3639 tuple(self._get_git_gerrit_identity_pairs()[host])),
3640 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003641
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003642 def find_and_report_problems(self):
3643 """Returns True if there was at least one problem, else False."""
3644 found = False
3645 bad_hosts = set()
3646 for title, sublines, hosts in self._find_problems():
3647 if not found:
3648 found = True
3649 print('\n\n.gitcookies problem report:\n')
3650 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003651 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003652 if sublines:
3653 print()
3654 print(' %s' % '\n '.join(sublines))
3655 print()
3656
3657 if bad_hosts:
3658 assert found
3659 print(' You can manually remove corresponding lines in your %s file and '
3660 'visit the following URLs with correct account to generate '
3661 'correct credential lines:\n' %
3662 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
Garrett Beaty08bb5c42022-09-21 17:34:20 +00003663 print(' %s' % '\n '.join(
3664 sorted(
3665 set(gerrit_util.CookiesAuthenticator().get_new_password_url(
3666 _canonical_git_googlesource_host(host))
3667 for host in bad_hosts))))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003668 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003669
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003670
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003671@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003672def CMDcreds_check(parser, args):
3673 """Checks credentials and suggests changes."""
3674 _, _ = parser.parse_args(args)
3675
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003676 # Code below checks .gitcookies. Abort if using something else.
3677 authn = gerrit_util.Authenticator.get()
3678 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
Edward Lemur57d47422020-03-06 20:43:07 +00003679 message = (
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003680 'This command is not designed for bot environment. It checks '
3681 '~/.gitcookies file not generally used on bots.')
Edward Lemur57d47422020-03-06 20:43:07 +00003682 # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
3683 if isinstance(authn, gerrit_util.GceAuthenticator):
3684 message += (
3685 '\n'
3686 'If you need to run this on GCE or a cloudtop instance, '
3687 'export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
3688 DieWithError(message)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003689
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003690 checker = _GitCookiesChecker()
3691 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003692
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003693 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003694 checker.print_current_creds(include_netrc=True)
3695
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003696 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003697 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003698 return 0
3699 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003700
3701
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003702@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003703def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003704 """Gets or sets base-url for this branch."""
Thiago Perrotta16d08f02022-07-20 18:18:50 +00003705 _, args = parser.parse_args(args)
Edward Lesmes50da7702020-03-30 19:23:43 +00003706 branchref = scm.GIT.GetBranchRef(settings.GetRoot())
Edward Lemur85153282020-02-14 22:06:29 +00003707 branch = scm.GIT.ShortBranchName(branchref)
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003708 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003709 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003710 return RunGit(['config', 'branch.%s.base-url' % branch],
3711 error_ok=False).strip()
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003712
3713 print('Setting base-url to %s' % args[0])
3714 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3715 error_ok=False).strip()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003716
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003717
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003718def color_for_status(status):
3719 """Maps a Changelist status to color, for CMDstatus and other tools."""
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003720 BOLD = '\033[1m'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003721 return {
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00003722 'unsent': BOLD + Fore.YELLOW,
3723 'waiting': BOLD + Fore.RED,
3724 'reply': BOLD + Fore.YELLOW,
3725 'not lgtm': BOLD + Fore.RED,
3726 'lgtm': BOLD + Fore.GREEN,
3727 'commit': BOLD + Fore.MAGENTA,
3728 'closed': BOLD + Fore.CYAN,
3729 'error': BOLD + Fore.WHITE,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003730 }.get(status, Fore.WHITE)
3731
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003732
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003733def get_cl_statuses(changes, fine_grained, max_processes=None):
3734 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003735
3736 If fine_grained is true, this will fetch CL statuses from the server.
3737 Otherwise, simply indicate if there's a matching url for the given branches.
3738
3739 If max_processes is specified, it is used as the maximum number of processes
3740 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3741 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003742
3743 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003744 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003745 if not changes:
Edward Lemur61bf4172020-02-24 23:22:37 +00003746 return
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003747
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003748 if not fine_grained:
3749 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003750 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003751 for cl in changes:
3752 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003753 return
3754
3755 # First, sort out authentication issues.
3756 logging.debug('ensuring credentials exist')
3757 for cl in changes:
3758 cl.EnsureAuthenticated(force=False, refresh=True)
3759
3760 def fetch(cl):
3761 try:
3762 return (cl, cl.GetStatus())
3763 except:
3764 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003765 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003766 raise
3767
3768 threads_count = len(changes)
3769 if max_processes:
3770 threads_count = max(1, min(threads_count, max_processes))
3771 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3772
Edward Lemur61bf4172020-02-24 23:22:37 +00003773 pool = multiprocessing.pool.ThreadPool(threads_count)
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003774 fetched_cls = set()
3775 try:
3776 it = pool.imap_unordered(fetch, changes).__iter__()
3777 while True:
3778 try:
3779 cl, status = it.next(timeout=5)
Edward Lemur61bf4172020-02-24 23:22:37 +00003780 except (multiprocessing.TimeoutError, StopIteration):
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003781 break
3782 fetched_cls.add(cl)
3783 yield cl, status
3784 finally:
3785 pool.close()
3786
3787 # Add any branches that failed to fetch.
3788 for cl in set(changes) - fetched_cls:
3789 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003790
rmistry@google.com2dd99862015-06-22 12:22:18 +00003791
Jose Lopes3863fc52020-04-07 17:00:25 +00003792def upload_branch_deps(cl, args, force=False):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003793 """Uploads CLs of local branches that are dependents of the current branch.
3794
3795 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003796
3797 test1 -> test2.1 -> test3.1
3798 -> test3.2
3799 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003800
3801 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3802 run on the dependent branches in this order:
3803 test2.1, test3.1, test3.2, test2.2, test3.3
3804
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003805 Note: This function does not rebase your local dependent branches. Use it
3806 when you make a change to the parent branch that will not conflict
3807 with its dependent branches, and you would like their dependencies
3808 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003809 """
3810 if git_common.is_dirty_git_tree('upload-branch-deps'):
3811 return 1
3812
3813 root_branch = cl.GetBranch()
3814 if root_branch is None:
3815 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3816 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003817 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003818 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3819 'patchset dependencies without an uploaded CL.')
3820
3821 branches = RunGit(['for-each-ref',
3822 '--format=%(refname:short) %(upstream:short)',
3823 'refs/heads'])
3824 if not branches:
3825 print('No local branches found.')
3826 return 0
3827
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003828 # Create a dictionary of all local branches to the branches that are
3829 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003830 tracked_to_dependents = collections.defaultdict(list)
3831 for b in branches.splitlines():
3832 tokens = b.split()
3833 if len(tokens) == 2:
3834 branch_name, tracked = tokens
3835 tracked_to_dependents[tracked].append(branch_name)
3836
vapiera7fbd5a2016-06-16 09:17:49 -07003837 print()
3838 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003839 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003840
rmistry@google.com2dd99862015-06-22 12:22:18 +00003841 def traverse_dependents_preorder(branch, padding=''):
3842 dependents_to_process = tracked_to_dependents.get(branch, [])
3843 padding += ' '
3844 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003845 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003846 dependents.append(dependent)
3847 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003848
rmistry@google.com2dd99862015-06-22 12:22:18 +00003849 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003850 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003851
3852 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003854 return 0
3855
rmistry@google.com2dd99862015-06-22 12:22:18 +00003856 # Record all dependents that failed to upload.
3857 failures = {}
3858 # Go through all dependents, checkout the branch and upload.
3859 try:
3860 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003861 print()
3862 print('--------------------------------------')
3863 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003864 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003865 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003866 try:
3867 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003868 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003869 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003870 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003871 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003872 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003873 finally:
3874 # Swap back to the original root branch.
3875 RunGit(['checkout', '-q', root_branch])
3876
vapiera7fbd5a2016-06-16 09:17:49 -07003877 print()
3878 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003879 for dependent_branch in dependents:
3880 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003881 print(' %s : %s' % (dependent_branch, upload_status))
3882 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003883
3884 return 0
3885
3886
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003887def GetArchiveTagForBranch(issue_num, branch_name, existing_tags, pattern):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003888 """Given a proposed tag name, returns a tag name that is guaranteed to be
3889 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3890 or 'foo-3', and so on."""
3891
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003892 proposed_tag = pattern.format(**{'issue': issue_num, 'branch': branch_name})
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003893 for suffix_num in itertools.count(1):
3894 if suffix_num == 1:
3895 to_check = proposed_tag
3896 else:
3897 to_check = '%s-%d' % (proposed_tag, suffix_num)
3898
3899 if to_check not in existing_tags:
3900 return to_check
3901
3902
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003903@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003904def CMDarchive(parser, args):
3905 """Archives and deletes branches associated with closed changelists."""
3906 parser.add_option(
3907 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003908 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003909 parser.add_option(
3910 '-f', '--force', action='store_true',
3911 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003912 parser.add_option(
3913 '-d', '--dry-run', action='store_true',
3914 help='Skip the branch tagging and removal steps.')
3915 parser.add_option(
3916 '-t', '--notags', action='store_true',
3917 help='Do not tag archived branches. '
3918 'Note: local commit history may be lost.')
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003919 parser.add_option(
3920 '-p',
3921 '--pattern',
3922 default='git-cl-archived-{issue}-{branch}',
3923 help='Format string for archive tags. '
3924 'E.g. \'archived-{issue}-{branch}\'.')
kmarshall3bff56b2016-06-06 18:31:47 -07003925
kmarshall3bff56b2016-06-06 18:31:47 -07003926 options, args = parser.parse_args(args)
3927 if args:
3928 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003929
3930 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3931 if not branches:
3932 return 0
3933
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003934 tags = RunGit(['for-each-ref', '--format=%(refname)',
3935 'refs/tags']).splitlines() or []
3936 tags = [t.split('/')[-1] for t in tags]
3937
vapiera7fbd5a2016-06-16 09:17:49 -07003938 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003939 changes = [Changelist(branchref=b)
3940 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003941 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3942 statuses = get_cl_statuses(changes,
3943 fine_grained=True,
3944 max_processes=options.maxjobs)
3945 proposal = [(cl.GetBranch(),
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00003946 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(), tags,
3947 options.pattern))
kmarshall3bff56b2016-06-06 18:31:47 -07003948 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003949 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003950 proposal.sort()
3951
3952 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003953 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003954 return 0
3955
Edward Lemur85153282020-02-14 22:06:29 +00003956 current_branch = scm.GIT.GetBranch(settings.GetRoot())
kmarshall3bff56b2016-06-06 18:31:47 -07003957
vapiera7fbd5a2016-06-16 09:17:49 -07003958 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003959 if options.notags:
3960 for next_item in proposal:
3961 print(' ' + next_item[0])
3962 else:
3963 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3964 for next_item in proposal:
3965 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003966
kmarshall9249e012016-08-23 12:02:16 -07003967 # Quit now on precondition failure or if instructed by the user, either
3968 # via an interactive prompt or by command line flags.
3969 if options.dry_run:
3970 print('\nNo changes were made (dry run).\n')
3971 return 0
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003972
3973 if any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003974 print('You are currently on a branch \'%s\' which is associated with a '
3975 'closed codereview issue, so archive cannot proceed. Please '
3976 'checkout another branch and run this command again.' %
3977 current_branch)
3978 return 1
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00003979
3980 if not options.force:
Edward Lesmesae3586b2020-03-23 21:21:14 +00003981 answer = gclient_utils.AskForData('\nProceed with deletion (Y/n)? ').lower()
sergiyb4a5ecbe2016-06-20 09:46:00 -07003982 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003983 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003984 return 1
3985
3986 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003987 if not options.notags:
3988 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003989
3990 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3991 # Clean up the tag if we failed to delete the branch.
3992 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003993
vapiera7fbd5a2016-06-16 09:17:49 -07003994 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003995
3996 return 0
3997
3998
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003999@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004000def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004001 """Show status of changelists.
4002
4003 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004004 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004005 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004006 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004007 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004008 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004009 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004010 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004011
4012 Also see 'git cl comments'.
4013 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00004014 parser.add_option(
4015 '--no-branch-color',
4016 action='store_true',
4017 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004018 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004019 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004020 parser.add_option('-f', '--fast', action='store_true',
4021 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004022 parser.add_option(
4023 '-j', '--maxjobs', action='store', type=int,
4024 help='The maximum number of jobs to use when retrieving review status')
Edward Lemur52969c92020-02-06 18:15:28 +00004025 parser.add_option(
4026 '-i', '--issue', type=int,
4027 help='Operate on this issue instead of the current branch\'s implicit '
4028 'issue. Requires --field to be set.')
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004029 parser.add_option('-d',
4030 '--date-order',
4031 action='store_true',
4032 help='Order branches by committer date.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004033 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004034 if args:
4035 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004036
iannuccie53c9352016-08-17 14:40:40 -07004037 if options.issue is not None and not options.field:
Edward Lemur6c6827c2020-02-06 21:15:18 +00004038 parser.error('--field must be given when --issue is set.')
iannucci3c972b92016-08-17 13:24:10 -07004039
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004040 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00004041 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042 if options.field.startswith('desc'):
Edward Lemur6c6827c2020-02-06 21:15:18 +00004043 if cl.GetIssue():
4044 print(cl.FetchDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004045 elif options.field == 'id':
4046 issueid = cl.GetIssue()
4047 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004048 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004049 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004050 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004053 elif options.field == 'status':
4054 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004055 elif options.field == 'url':
4056 url = cl.GetIssueURL()
4057 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004058 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004059 return 0
4060
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004061 branches = RunGit([
4062 'for-each-ref', '--format=%(refname) %(committerdate:unix)', 'refs/heads'
4063 ])
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004064 if not branches:
4065 print('No local branch found.')
4066 return 0
4067
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004068 changes = [
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004069 Changelist(branchref=b, commit_date=ct)
4070 for b, ct in map(lambda line: line.split(' '), branches.splitlines())
4071 ]
vapiera7fbd5a2016-06-16 09:17:49 -07004072 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004073 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004074 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004075 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004076
Edward Lemur85153282020-02-14 22:06:29 +00004077 current_branch = scm.GIT.GetBranch(settings.GetRoot())
Daniel McArdlea23bf592019-02-12 00:25:12 +00004078
4079 def FormatBranchName(branch, colorize=False):
4080 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
4081 an asterisk when it is the current branch."""
4082
4083 asterisk = ""
4084 color = Fore.RESET
4085 if branch == current_branch:
4086 asterisk = "* "
4087 color = Fore.GREEN
Edward Lemur85153282020-02-14 22:06:29 +00004088 branch_name = scm.GIT.ShortBranchName(branch)
Daniel McArdlea23bf592019-02-12 00:25:12 +00004089
4090 if colorize:
4091 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00004092 return asterisk + branch_name
4093
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004094 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00004095
4096 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
Sigurd Schneider1bfda8e2021-06-30 14:46:25 +00004097
4098 if options.date_order or settings.IsStatusCommitOrderByDate():
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004099 sorted_changes = sorted(changes,
4100 key=lambda c: c.GetCommitDate(),
4101 reverse=True)
4102 else:
4103 sorted_changes = sorted(changes, key=lambda c: c.GetBranch())
4104 for cl in sorted_changes:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004105 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004106 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00004107 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004108 branch_statuses[c.GetBranch()] = status
4109 status = branch_statuses.pop(branch)
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +00004110 url = cl.GetIssueURL(short=True)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004111 if url and (not status or status == 'error'):
4112 # The issue probably doesn't exist anymore.
4113 url += ' (broken)'
4114
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004115 color = color_for_status(status)
Bruce Dawsonb73f8a92020-03-27 22:03:08 +00004116 # Turn off bold as well as colors.
4117 END = '\033[0m'
4118 reset = Fore.RESET + END
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004119 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004120 color = ''
4121 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004122 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00004123
Alan Cuttera3be9a52019-03-04 18:50:33 +00004124 branch_display = FormatBranchName(branch)
4125 padding = ' ' * (alignment - len(branch_display))
4126 if not options.no_branch_color:
4127 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00004128
Alan Cuttera3be9a52019-03-04 18:50:33 +00004129 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
4130 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004131
vapiera7fbd5a2016-06-16 09:17:49 -07004132 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00004133 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004134 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00004135 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004136 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004137 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004138 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004139 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004140 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004141 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004142 print('Issue description:')
Edward Lemur6c6827c2020-02-06 21:15:18 +00004143 print(cl.FetchDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004144 return 0
4145
4146
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004147def colorize_CMDstatus_doc():
4148 """To be called once in main() to add colors to git cl status help."""
4149 colors = [i for i in dir(Fore) if i[0].isupper()]
4150
4151 def colorize_line(line):
4152 for color in colors:
4153 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004154 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004155 indent = len(line) - len(line.lstrip(' ')) + 1
4156 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4157 return line
4158
4159 lines = CMDstatus.__doc__.splitlines()
4160 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4161
4162
phajdan.jre328cf92016-08-22 04:12:17 -07004163def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004164 if path == '-':
4165 json.dump(contents, sys.stdout)
4166 else:
4167 with open(path, 'w') as f:
4168 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004169
4170
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004171@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004172@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004173def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004174 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004175
4176 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004177 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004178 parser.add_option('-r', '--reverse', action='store_true',
4179 help='Lookup the branch(es) for the specified issues. If '
4180 'no issues are specified, all branches with mapped '
4181 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004182 parser.add_option('--json',
4183 help='Path to JSON output file, or "-" for stdout.')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004184 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004185
dnj@chromium.org406c4402015-03-03 17:22:28 +00004186 if options.reverse:
Arthur Milchior801a9752023-04-07 10:33:54 +00004187 branches = RunGit(['for-each-ref', 'refs/heads',
4188 '--format=%(refname)']).splitlines()
4189 # Reverse issue lookup.
4190 issue_branch_map = {}
4191
4192 git_config = {}
4193 for config in RunGit(['config', '--get-regexp',
4194 r'branch\..*issue']).splitlines():
4195 name, _space, val = config.partition(' ')
4196 git_config[name] = val
4197
4198 for branch in branches:
4199 issue = git_config.get(
4200 'branch.%s.%s' % (scm.GIT.ShortBranchName(branch), ISSUE_CONFIG_KEY))
4201 if issue:
4202 issue_branch_map.setdefault(int(issue), []).append(branch)
4203 if not args:
4204 args = sorted(issue_branch_map.keys())
4205 result = {}
4206 for issue in args:
4207 try:
4208 issue_num = int(issue)
4209 except ValueError:
4210 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
4211 continue
4212 result[issue_num] = issue_branch_map.get(issue_num)
4213 print('Branch for issue number %s: %s' %
4214 (issue, ', '.join(issue_branch_map.get(issue_num) or ('None', ))))
4215 if options.json:
4216 write_json(options.json, result)
4217 return 0
Aaron Gable78753da2017-06-15 10:35:49 -07004218
4219 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004220 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004221 if not issue.valid:
4222 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4223 'or no argument to list it.\n'
4224 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004225 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004226 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004227 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004228 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004229 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4230 if options.json:
4231 write_json(options.json, {
Nodir Turakulov27379632021-03-17 18:53:29 +00004232 'gerrit_host': cl.GetGerritHost(),
4233 'gerrit_project': cl.GetGerritProject(),
Aaron Gable78753da2017-06-15 10:35:49 -07004234 'issue_url': cl.GetIssueURL(),
Nodir Turakulov27379632021-03-17 18:53:29 +00004235 'issue': cl.GetIssue(),
Aaron Gable78753da2017-06-15 10:35:49 -07004236 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004237 return 0
4238
4239
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004240@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004241def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004242 """Shows or posts review comments for any changelist."""
4243 parser.add_option('-a', '--add-comment', dest='comment',
4244 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004245 parser.add_option('-p', '--publish', action='store_true',
4246 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004247 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004248 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004249 parser.add_option('-m', '--machine-readable', dest='readable',
4250 action='store_false', default=True,
4251 help='output comments in a format compatible with '
4252 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004253 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004254 help='File to write JSON summary to, or "-" for stdout')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004255 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004256
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004257 issue = None
4258 if options.issue:
4259 try:
4260 issue = int(options.issue)
4261 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004262 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004263
Edward Lemur934836a2019-09-09 20:16:54 +00004264 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004265
4266 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004267 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004268 return 0
4269
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004270 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4271 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004272 for comment in summary:
4273 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004274 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004275 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004276 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004277 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004278 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004279 elif comment.autogenerated:
4280 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004281 else:
4282 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004283 print('\n%s%s %s%s\n%s' % (
4284 color,
4285 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4286 comment.sender,
4287 Fore.RESET,
4288 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4289
smut@google.comc85ac942015-09-15 16:34:43 +00004290 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004291 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004292 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004293 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4294 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004295 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004296 return 0
4297
4298
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004299@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004300@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004301def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004302 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004303 parser.add_option('-d', '--display', action='store_true',
4304 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004305 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004306 help='New description to set for this issue (- for stdin, '
4307 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004308 parser.add_option('-f', '--force', action='store_true',
4309 help='Delete any unpublished Gerrit edits for this issue '
4310 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004311
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004312 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004313
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004314 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004315 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004316 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004317 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004318 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004319
Edward Lemur934836a2019-09-09 20:16:54 +00004320 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004321 if target_issue_arg:
4322 kwargs['issue'] = target_issue_arg.issue
4323 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004324
4325 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004326 if not cl.GetIssue():
4327 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004328
Edward Lemur678a6842019-10-03 22:25:05 +00004329 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004330 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004331
Edward Lemur6c6827c2020-02-06 21:15:18 +00004332 description = ChangeDescription(cl.FetchDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004333
smut@google.com34fb6b12015-07-13 20:03:26 +00004334 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004335 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004336 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004337
4338 if options.new_description:
4339 text = options.new_description
4340 if text == '-':
4341 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004342 elif text == '+':
4343 base_branch = cl.GetCommonAncestorWithUpstream()
Edward Lemura12175c2020-03-09 16:58:26 +00004344 text = _create_description_from_log([base_branch])
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004345
4346 description.set_description(text)
4347 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004348 description.prompt()
Edward Lemur6c6827c2020-02-06 21:15:18 +00004349 if cl.FetchDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004350 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004351 return 0
4352
4353
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004354@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004355def CMDlint(parser, args):
4356 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004357 parser.add_option('--filter', action='append', metavar='-x,+y',
4358 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004359 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004360
4361 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004362 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004363 try:
4364 import cpplint
4365 import cpplint_chromium
4366 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004367 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004368 return 1
4369
4370 # Change the current working directory before calling lint so that it
4371 # shows the correct base.
4372 previous_cwd = os.getcwd()
4373 os.chdir(settings.GetRoot())
4374 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004375 cl = Changelist()
Edward Lemur2c62b332020-03-12 22:12:33 +00004376 files = cl.GetAffectedFiles(cl.GetCommonAncestorWithUpstream())
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004377 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004378 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004379 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004380
Lei Zhangb8c62cf2020-07-15 20:09:37 +00004381 # Process cpplint arguments, if any.
4382 filters = presubmit_canned_checks.GetCppLintFilters(options.filter)
4383 command = ['--filter=' + ','.join(filters)] + args + files
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004384 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004385
Lei Zhang379d1ad2020-07-15 19:40:06 +00004386 include_regex = re.compile(settings.GetLintRegex())
4387 ignore_regex = re.compile(settings.GetLintIgnoreRegex())
thestig@chromium.org44202a22014-03-11 19:22:18 +00004388 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4389 for filename in filenames:
Lei Zhang379d1ad2020-07-15 19:40:06 +00004390 if not include_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004391 print('Skipping file %s' % filename)
Lei Zhang379d1ad2020-07-15 19:40:06 +00004392 continue
4393
4394 if ignore_regex.match(filename):
4395 print('Ignoring file %s' % filename)
4396 continue
4397
4398 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4399 extra_check_functions)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004400 finally:
4401 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004402 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004403 if cpplint._cpplint_state.error_count != 0:
4404 return 1
4405 return 0
4406
4407
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004408@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004409def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004410 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004411 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004412 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004413 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004414 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004415 parser.add_option('--all', action='store_true',
4416 help='Run checks against all files, not just modified ones')
Josip Sokcevic017544d2022-03-31 23:47:53 +00004417 parser.add_option('--files',
4418 nargs=1,
4419 help='Semicolon-separated list of files to be marked as '
4420 'modified when executing presubmit or post-upload hooks. '
4421 'fnmatch wildcards can also be used.')
Edward Lesmes8e282792018-04-03 18:50:29 -04004422 parser.add_option('--parallel', action='store_true',
4423 help='Run all tests specified by input_api.RunTests in all '
4424 'PRESUBMIT files in parallel.')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00004425 parser.add_option('--resultdb', action='store_true',
4426 help='Run presubmit checks in the ResultSink environment '
4427 'and send results to the ResultDB database.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00004428 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004429 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004430
sbc@chromium.org71437c02015-04-09 19:29:40 +00004431 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004432 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004433 return 1
4434
Edward Lemur934836a2019-09-09 20:16:54 +00004435 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004436 if args:
4437 base_branch = args[0]
4438 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004439 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004440 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004442 start = time.time()
4443 try:
4444 if not 'PRESUBMIT_SKIP_NETWORK' in os.environ and cl.GetIssue():
4445 description = cl.FetchDescription()
4446 else:
4447 description = _create_description_from_log([base_branch])
4448 except Exception as e:
4449 print('Failed to fetch CL description - %s' % str(e))
Edward Lemura12175c2020-03-09 16:58:26 +00004450 description = _create_description_from_log([base_branch])
Bruce Dawsoneb8426e2022-08-05 23:58:15 +00004451 elapsed = time.time() - start
4452 if elapsed > 5:
4453 print('%.1f s to get CL description.' % elapsed)
Aaron Gable8076c282017-11-29 14:39:41 -08004454
Bruce Dawson13acea32022-05-03 22:13:08 +00004455 if not base_branch:
4456 if not options.force:
4457 print('use --force to check even when not on a branch.')
4458 return 1
4459 base_branch = 'HEAD'
4460
Josip Sokcevic017544d2022-03-31 23:47:53 +00004461 cl.RunHook(committing=not options.upload,
4462 may_prompt=False,
4463 verbose=options.verbose,
4464 parallel=options.parallel,
4465 upstream=base_branch,
4466 description=description,
4467 all_files=options.all,
4468 files=options.files,
4469 resultdb=options.resultdb,
4470 realm=options.realm)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004471 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004472
4473
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004474def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004475 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004476
4477 Works the same way as
4478 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4479 but can be called on demand on all platforms.
4480
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004481 The basic idea is to generate git hash of a state of the tree, original
4482 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004483 """
4484 lines = []
4485 tree_hash = RunGitSilent(['write-tree'])
4486 lines.append('tree %s' % tree_hash.strip())
4487 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4488 if code == 0:
4489 lines.append('parent %s' % parent.strip())
4490 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4491 lines.append('author %s' % author.strip())
4492 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4493 lines.append('committer %s' % committer.strip())
4494 lines.append('')
4495 # Note: Gerrit's commit-hook actually cleans message of some lines and
4496 # whitespace. This code is not doing this, but it clearly won't decrease
4497 # entropy.
4498 lines.append(message)
4499 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004500 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004501 return 'I%s' % change_hash.strip()
4502
4503
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004504def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004505 """Computes the remote branch ref to use for the CL.
4506
4507 Args:
4508 remote (str): The git remote for the CL.
4509 remote_branch (str): The git remote branch for the CL.
4510 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004511 """
4512 if not (remote and remote_branch):
4513 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004514
wittman@chromium.org455dc922015-01-26 20:15:50 +00004515 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004516 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004517 # refs, which are then translated into the remote full symbolic refs
4518 # below.
4519 if '/' not in target_branch:
4520 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4521 else:
4522 prefix_replacements = (
4523 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4524 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4525 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4526 )
4527 match = None
4528 for regex, replacement in prefix_replacements:
4529 match = re.search(regex, target_branch)
4530 if match:
4531 remote_branch = target_branch.replace(match.group(0), replacement)
4532 break
4533 if not match:
4534 # This is a branch path but not one we recognize; use as-is.
4535 remote_branch = target_branch
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004536 # pylint: disable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004537 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00004538 # pylint: enable=consider-using-get
rmistry@google.comc68112d2015-03-03 12:48:06 +00004539 # Handle the refs that need to land in different refs.
4540 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004541
wittman@chromium.org455dc922015-01-26 20:15:50 +00004542 # Create the true path to the remote branch.
4543 # Does the following translation:
4544 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004545 # * refs/remotes/origin/main -> refs/heads/main
wittman@chromium.org455dc922015-01-26 20:15:50 +00004546 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4547 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4548 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4549 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4550 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4551 'refs/heads/')
4552 elif remote_branch.startswith('refs/remotes/branch-heads'):
4553 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004554
wittman@chromium.org455dc922015-01-26 20:15:50 +00004555 return remote_branch
4556
4557
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004558def cleanup_list(l):
4559 """Fixes a list so that comma separated items are put as individual items.
4560
4561 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4562 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4563 """
4564 items = sum((i.split(',') for i in l), [])
4565 stripped_items = (i.strip() for i in items)
4566 return sorted(filter(None, stripped_items))
4567
4568
Aaron Gable4db38df2017-11-03 14:59:07 -07004569@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004570@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004571def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004572 """Uploads the current changelist to codereview.
4573
4574 Can skip dependency patchset uploads for a branch by running:
4575 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004576 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004577 git config --unset branch.branch_name.skip-deps-uploads
4578 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004579
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004580 If the name of the checked out branch starts with "bug-" or "fix-" followed
4581 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004582 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004583
4584 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004585 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004586 [git-cl] add support for hashtags
4587 Foo bar: implement foo
4588 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004589 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004590 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4591 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004592 parser.add_option('--bypass-watchlists', action='store_true',
4593 dest='bypass_watchlists',
4594 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004595 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004596 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004597 parser.add_option('--message', '-m', dest='message',
4598 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004599 parser.add_option('-b', '--bug',
4600 help='pre-populate the bug number(s) for this issue. '
4601 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004602 parser.add_option('--message-file', dest='message_file',
4603 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004604 parser.add_option('--title', '-t', dest='title',
4605 help='title for patchset')
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004606 parser.add_option('-T', '--skip-title', action='store_true',
4607 dest='skip_title',
4608 help='Use the most recent commit message as the title of '
4609 'the patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004610 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004611 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004612 help='reviewer email addresses')
4613 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004614 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004615 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004616 parser.add_option('--hashtag', dest='hashtags',
4617 action='append', default=[],
4618 help=('Gerrit hashtag for new CL; '
4619 'can be applied multiple times'))
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004620 parser.add_option('-s',
4621 '--send-mail',
4622 '--send-email',
4623 dest='send_mail',
4624 action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004625 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004626 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004627 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004628 metavar='TARGET',
4629 help='Apply CL to remote ref TARGET. ' +
Josip Sokcevicc39ab992020-09-24 20:09:15 +00004630 'Default: remote branch head, or main')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004631 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004632 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004633 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004634 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004635 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004636 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004637 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4638 const='R', help='add a set of OWNERS to R')
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004639 parser.add_option('-c',
4640 '--use-commit-queue',
4641 action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004642 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004643 help='tell the CQ to commit this patchset; '
Thiago Perrottab0fb8d52022-08-30 21:26:19 +00004644 'implies --send-mail')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004645 parser.add_option('-d', '--cq-dry-run',
4646 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004647 help='Send the patchset to do a CQ dry run right after '
4648 'upload.')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004649 parser.add_option(
4650 '-q',
4651 '--cq-quick-run',
4652 action='store_true',
4653 default=False,
4654 help='Send the patchset to do a CQ quick run right after '
4655 'upload (https://source.chromium.org/chromium/chromium/src/+/main:do'
4656 'cs/cq_quick_run.md) (chromium only).')
Edward Lesmes10c3dd62021-02-08 21:13:57 +00004657 parser.add_option('--set-bot-commit', action='store_true',
4658 help=optparse.SUPPRESS_HELP)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004659 parser.add_option('--preserve-tryjobs', action='store_true',
4660 help='instruct the CQ to let tryjobs running even after '
4661 'new patchsets are uploaded instead of canceling '
4662 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004663 parser.add_option('--dependencies', action='store_true',
4664 help='Uploads CLs of all the local branches that depend on '
4665 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004666 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4667 help='Sends your change to the CQ after an approval. Only '
4668 'works on repos that have the Auto-Submit label '
4669 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004670 parser.add_option('--parallel', action='store_true',
4671 help='Run all tests specified by input_api.RunTests in all '
4672 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004673 parser.add_option('--no-autocc', action='store_true',
4674 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004675 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004676 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004677 parser.add_option('-R', '--retry-failed', action='store_true',
4678 help='Retry failed tryjobs from old patchset immediately '
4679 'after uploading new patchset. Cannot be used with '
4680 '--use-commit-queue or --cq-dry-run.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004681 parser.add_option('--fixed', '-x',
4682 help='List of bugs that will be commented on and marked '
4683 'fixed (pre-populates "Fixed:" tag). Same format as '
4684 '-b option / "Bug:" tag. If fixing several issues, '
4685 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004686 parser.add_option('--edit-description', action='store_true', default=False,
4687 help='Modify description before upload. Cannot be used '
4688 'with --force. It is a noop when --no-squash is set '
4689 'or a new commit is created.')
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004690 parser.add_option('--git-completion-helper', action="store_true",
4691 help=optparse.SUPPRESS_HELP)
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00004692 parser.add_option('-o',
4693 '--push-options',
4694 action='append',
4695 default=[],
4696 help='Transmit the given string to the server when '
4697 'performing git push (pass-through). See git-push '
4698 'documentation for more details.')
Gregory Nisbet48d9e1e2021-04-15 23:35:54 +00004699 parser.add_option('--no-add-changeid',
4700 action='store_true',
4701 dest='no_add_changeid',
4702 help='Do not add change-ids to messages.')
Joanna Wangd75fc882023-03-01 21:53:34 +00004703 parser.add_option('--cherry-pick-stacked',
4704 '--cp',
4705 dest='cherry_pick_stacked',
4706 action='store_true',
4707 help='If parent branch has un-uploaded updates, '
4708 'automatically skip parent branches and just upload '
4709 'the current branch cherry-pick on its parent\'s last '
4710 'uploaded commit. Allows users to skip the potential '
4711 'interactive confirmation step.')
Joanna Wanga1abbed2023-01-24 01:41:05 +00004712 # TODO(b/265929888): Add --wip option of --cl-status option.
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004713
rmistry@google.com2dd99862015-06-22 12:22:18 +00004714 orig_args = args
ukai@chromium.orge8077812012-02-03 03:41:46 +00004715 (options, args) = parser.parse_args(args)
4716
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004717 if options.git_completion_helper:
Edward Lesmesb7db1832020-06-22 20:22:27 +00004718 print(' '.join(opt.get_opt_string() for opt in parser.option_list
4719 if opt.help != optparse.SUPPRESS_HELP))
4720 return
Ng Zhi Ancdaf0be2020-05-27 20:57:28 +00004721
sbc@chromium.org71437c02015-04-09 19:29:40 +00004722 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004723 return 1
4724
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004725 options.reviewers = cleanup_list(options.reviewers)
4726 options.cc = cleanup_list(options.cc)
4727
Josipe827b0f2020-01-30 00:07:20 +00004728 if options.edit_description and options.force:
4729 parser.error('Only one of --force and --edit-description allowed')
4730
tandriib80458a2016-06-23 12:20:07 -07004731 if options.message_file:
4732 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004733 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004734 options.message = gclient_utils.FileRead(options.message_file)
tandriib80458a2016-06-23 12:20:07 -07004735
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004736 if ([options.cq_dry_run,
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004737 options.cq_quick_run,
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004738 options.use_commit_queue,
4739 options.retry_failed].count(True) > 1):
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00004740 parser.error('Only one of --use-commit-queue, --cq-dry-run, --cq-quick-run '
4741 'or --retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004742
Mario Bianuccicebfb4e2020-07-22 23:08:16 +00004743 if options.skip_title and options.title:
4744 parser.error('Only one of --title and --skip-title allowed.')
4745
Aaron Gableedbc4132017-09-11 13:22:28 -07004746 if options.use_commit_queue:
4747 options.send_mail = True
4748
Edward Lesmes0dd54822020-03-26 18:24:25 +00004749 if options.squash is None:
4750 # Load default for user, repo, squash=true, in this order.
4751 options.squash = settings.GetSquashGerritUploads()
4752
Joanna Wang5051ffe2023-03-01 22:24:07 +00004753 cl = Changelist(branchref=options.target_branch)
4754
4755 # Warm change details cache now to avoid RPCs later, reducing latency for
4756 # developers.
4757 if cl.GetIssue():
4758 cl._GetChangeDetail(
4759 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
4760
4761 if options.retry_failed and not cl.GetIssue():
4762 print('No previous patchsets, so --retry-failed has no effect.')
4763 options.retry_failed = False
4764
Joanna Wangddd85782023-04-28 13:23:29 +00004765 dogfood_stacked_changes = os.environ.get(DOGFOOD_STACKED_CHANGES_VAR) != '0'
Joanna Wang5051ffe2023-03-01 22:24:07 +00004766
4767 if dogfood_stacked_changes:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004768 print(
4769 'This repo has been enrolled in the stacked changes dogfood.\n'
4770 '`git cl upload` now uploads the current branch and all upstream '
4771 'branches that have un-uploaded updates.\n'
4772 'Patches can now be reapplied with --force:\n'
4773 '`git cl patch --reapply --force`.\n'
4774 'Googlers may visit go/stacked-changes-dogfood for more information.\n'
4775 'To opt-out use `export DOGFOOD_STACKED_CHANGES=0`. '
4776 'File bugs at https://bit.ly/3Y6opoI\n')
Joanna Wang5051ffe2023-03-01 22:24:07 +00004777
Joanna Wangddd85782023-04-28 13:23:29 +00004778 if options.squash and dogfood_stacked_changes:
Brian Ryner8d19d862023-04-12 13:32:49 +00004779 print('Depot Tools no longer sets new uploads to "WIP". Please update the\n'
4780 '"Set new changes to "work in progress" by default" checkbox at\n'
Joanna Wang1398e4f2023-05-01 18:49:13 +00004781 'https://<host>-review.googlesource.com/settings/\n')
Joanna Wangdd12deb2023-01-26 20:43:28 +00004782 if options.dependencies:
Joanna Wang1398e4f2023-05-01 18:49:13 +00004783 parser.error('--dependencies is not available for this dogfood workflow.')
Joanna Wang18de1f62023-01-21 01:24:24 +00004784
Joanna Wangd75fc882023-03-01 21:53:34 +00004785 if options.cherry_pick_stacked:
4786 try:
4787 orig_args.remove('--cherry-pick-stacked')
4788 except ValueError:
4789 orig_args.remove('--cp')
Joanna Wang18de1f62023-01-21 01:24:24 +00004790 UploadAllSquashed(options, orig_args)
4791 return 0
4792
Joanna Wangd75fc882023-03-01 21:53:34 +00004793 if options.cherry_pick_stacked:
4794 parser.error('--cherry-pick-stacked is not available for this workflow.')
4795
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004796 # cl.GetMostRecentPatchset uses cached information, and can return the last
4797 # patchset before upload. Calling it here makes it clear that it's the
4798 # last patchset before upload. Note that GetMostRecentPatchset will fail
4799 # if no CL has been uploaded yet.
4800 if options.retry_failed:
4801 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004802
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004803 ret = cl.CMDUpload(options, args, orig_args)
4804
4805 if options.retry_failed:
4806 if ret != 0:
4807 print('Upload failed, so --retry-failed has no effect.')
4808 return ret
Joanna Wanga8db0cb2023-01-24 15:43:17 +00004809 builds, _ = _fetch_latest_builds(cl,
4810 DEFAULT_BUILDBUCKET_HOST,
4811 latest_patchset=patchset)
Edward Lemur45768512020-03-02 19:03:14 +00004812 jobs = _filter_failed_for_retry(builds)
4813 if len(jobs) == 0:
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004814 print('No failed tryjobs, so --retry-failed has no effect.')
4815 return ret
Quinten Yearsley777660f2020-03-04 23:37:06 +00004816 _trigger_tryjobs(cl, jobs, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004817
4818 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004819
4820
Joanna Wang18de1f62023-01-21 01:24:24 +00004821def UploadAllSquashed(options, orig_args):
4822 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4823 """Uploads the current and upstream branches (if necessary)."""
Joanna Wangc710e2d2023-01-25 14:53:22 +00004824 cls, cherry_pick_current = _UploadAllPrecheck(options, orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00004825
Joanna Wangc710e2d2023-01-25 14:53:22 +00004826 # Create commits.
4827 uploads_by_cl = [] #type: Sequence[Tuple[Changelist, _NewUpload]]
4828 if cherry_pick_current:
4829 parent = cls[1]._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
4830 new_upload = cls[0].PrepareCherryPickSquashedCommit(options, parent)
4831 uploads_by_cl.append((cls[0], new_upload))
4832 else:
Joanna Wangc710e2d2023-01-25 14:53:22 +00004833 ordered_cls = list(reversed(cls))
4834
Joanna Wang6215dd02023-02-07 15:58:03 +00004835 cl = ordered_cls[0]
Joanna Wang7603f042023-03-01 22:17:36 +00004836 # We can only support external changes when we're only uploading one
4837 # branch.
4838 parent = cl._UpdateWithExternalChanges() if len(ordered_cls) == 1 else None
Joanna Wang05b60342023-03-29 20:25:57 +00004839 orig_parent = None
Joanna Wang7603f042023-03-01 22:17:36 +00004840 if parent is None:
4841 origin = '.'
4842 branch = cl.GetBranch()
Joanna Wang74c53b62023-03-01 22:00:22 +00004843
Joanna Wang7603f042023-03-01 22:17:36 +00004844 while origin == '.':
4845 # Search for cl's closest ancestor with a gerrit hash.
4846 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(branch)
4847 if origin == '.':
4848 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4849
4850 # Support the `git merge` and `git pull` workflow.
4851 if upstream_branch in ['master', 'main']:
4852 parent = cl.GetCommonAncestorWithUpstream()
4853 else:
Joanna Wang05b60342023-03-29 20:25:57 +00004854 orig_parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4855 upstream_branch,
4856 LAST_UPLOAD_HASH_CONFIG_KEY)
Joanna Wang7603f042023-03-01 22:17:36 +00004857 parent = scm.GIT.GetBranchConfig(settings.GetRoot(),
4858 upstream_branch,
4859 GERRIT_SQUASH_HASH_CONFIG_KEY)
4860 if parent:
4861 break
4862 branch = upstream_branch
4863 else:
4864 # Either the root of the tree is the cl's direct parent and the while
4865 # loop above only found empty branches between cl and the root of the
4866 # tree.
4867 parent = cl.GetCommonAncestorWithUpstream()
Joanna Wang6215dd02023-02-07 15:58:03 +00004868
Joanna Wang05b60342023-03-29 20:25:57 +00004869 if orig_parent is None:
4870 orig_parent = parent
Joanna Wangc710e2d2023-01-25 14:53:22 +00004871 for i, cl in enumerate(ordered_cls):
4872 # If we're in the middle of the stack, set end_commit to downstream's
4873 # direct ancestor.
4874 if i + 1 < len(ordered_cls):
4875 child_base_commit = ordered_cls[i + 1].GetCommonAncestorWithUpstream()
4876 else:
4877 child_base_commit = None
4878 new_upload = cl.PrepareSquashedCommit(options,
Joanna Wang6215dd02023-02-07 15:58:03 +00004879 parent,
Joanna Wang05b60342023-03-29 20:25:57 +00004880 orig_parent,
Joanna Wangc710e2d2023-01-25 14:53:22 +00004881 end_commit=child_base_commit)
4882 uploads_by_cl.append((cl, new_upload))
Joanna Wangc710e2d2023-01-25 14:53:22 +00004883 parent = new_upload.commit_to_push
Joanna Wang05b60342023-03-29 20:25:57 +00004884 orig_parent = child_base_commit
Joanna Wangc710e2d2023-01-25 14:53:22 +00004885
4886 # Create refspec options
4887 cl, new_upload = uploads_by_cl[-1]
4888 refspec_opts = cl._GetRefSpecOptions(
4889 options,
4890 new_upload.change_desc,
Joanna Wang562481d2023-01-26 21:57:14 +00004891 multi_change_upload=len(uploads_by_cl) > 1,
4892 dogfood_path=True)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004893 refspec_suffix = ''
4894 if refspec_opts:
4895 refspec_suffix = '%' + ','.join(refspec_opts)
4896 assert ' ' not in refspec_suffix, ('spaces not allowed in refspec: "%s"' %
4897 refspec_suffix)
4898
4899 remote, remote_branch = cl.GetRemoteBranch()
4900 branch = GetTargetRef(remote, remote_branch, options.target_branch)
4901 refspec = '%s:refs/for/%s%s' % (new_upload.commit_to_push, branch,
4902 refspec_suffix)
4903
4904 # Git push
4905 git_push_metadata = {
4906 'gerrit_host':
4907 cl.GetGerritHost(),
4908 'title':
4909 options.title or '<untitled>',
4910 'change_id':
4911 git_footers.get_footer_change_id(new_upload.change_desc.description),
4912 'description':
4913 new_upload.change_desc.description,
4914 }
4915 push_stdout = cl._RunGitPushWithTraces(refspec, refspec_opts,
Joanna Wang34086522023-03-14 22:01:57 +00004916 git_push_metadata,
4917 options.push_options)
Joanna Wangc710e2d2023-01-25 14:53:22 +00004918
4919 # Post push updates
4920 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
4921 change_numbers = [
4922 m.group(1) for m in map(regex.match, push_stdout.splitlines()) if m
4923 ]
4924
4925 for i, (cl, new_upload) in enumerate(uploads_by_cl):
4926 cl.PostUploadUpdates(options, new_upload, change_numbers[i])
4927
4928 return 0
Joanna Wang18de1f62023-01-21 01:24:24 +00004929
4930
4931def _UploadAllPrecheck(options, orig_args):
4932 # type: (optparse.Values, Sequence[str]) -> Tuple[Sequence[Changelist], bool]
4933 """Checks the state of the tree and gives the user uploading options
4934
4935 Returns: A tuple of the ordered list of changes that have new commits
4936 since their last upload and a boolean of whether the user wants to
4937 cherry-pick and upload the current branch instead of uploading all cls.
4938 """
Joanna Wang6b98cdc2023-02-16 00:37:20 +00004939 cl = Changelist()
4940 if cl.GetBranch() is None:
4941 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
4942
Joanna Wang18de1f62023-01-21 01:24:24 +00004943 branch_ref = None
4944 cls = []
4945 must_upload_upstream = False
Joanna Wang6215dd02023-02-07 15:58:03 +00004946 first_pass = True
Joanna Wang18de1f62023-01-21 01:24:24 +00004947
4948 Changelist._GerritCommitMsgHookCheck(offer_removal=not options.force)
4949
4950 while True:
4951 if len(cls) > _MAX_STACKED_BRANCHES_UPLOAD:
4952 DieWithError(
4953 'More than %s branches in the stack have not been uploaded.\n'
4954 'Are your branches in a misconfigured state?\n'
4955 'If not, please upload some upstream changes first.' %
4956 (_MAX_STACKED_BRANCHES_UPLOAD))
4957
4958 cl = Changelist(branchref=branch_ref)
Joanna Wang18de1f62023-01-21 01:24:24 +00004959
Joanna Wang6215dd02023-02-07 15:58:03 +00004960 # Only add CL if it has anything to commit.
4961 base_commit = cl.GetCommonAncestorWithUpstream()
4962 end_commit = RunGit(['rev-parse', cl.GetBranchRef()]).strip()
4963
4964 diff = RunGitSilent(['diff', '%s..%s' % (base_commit, end_commit)])
4965 if diff:
4966 cls.append(cl)
4967 if (not first_pass and
4968 cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY) is None):
4969 # We are mid-stack and the user must upload their upstream branches.
4970 must_upload_upstream = True
4971 elif first_pass: # The current branch has nothing to commit. Exit.
4972 DieWithError('Branch %s has nothing to commit' % cl.GetBranch())
4973 # Else: A mid-stack branch has nothing to commit. We do not add it to cls.
4974 first_pass = False
4975
4976 # Cases below determine if we should continue to traverse up the tree.
Joanna Wang18de1f62023-01-21 01:24:24 +00004977 origin, upstream_branch_ref = Changelist.FetchUpstreamTuple(cl.GetBranch())
Joanna Wang18de1f62023-01-21 01:24:24 +00004978 branch_ref = upstream_branch_ref # set branch for next run.
4979
Joanna Wang6215dd02023-02-07 15:58:03 +00004980 upstream_branch = scm.GIT.ShortBranchName(upstream_branch_ref)
4981 upstream_last_upload = scm.GIT.GetBranchConfig(settings.GetRoot(),
4982 upstream_branch,
4983 LAST_UPLOAD_HASH_CONFIG_KEY)
4984
Joanna Wang18de1f62023-01-21 01:24:24 +00004985 # Case 1: We've reached the beginning of the tree.
4986 if origin != '.':
4987 break
4988
Joanna Wang18de1f62023-01-21 01:24:24 +00004989 # Case 2: If any upstream branches have never been uploaded,
Joanna Wang6215dd02023-02-07 15:58:03 +00004990 # the user MUST upload them unless they are empty. Continue to
4991 # next loop to add upstream if it is not empty.
Joanna Wang18de1f62023-01-21 01:24:24 +00004992 if not upstream_last_upload:
Joanna Wang18de1f62023-01-21 01:24:24 +00004993 continue
4994
Joanna Wang18de1f62023-01-21 01:24:24 +00004995 # Case 3: If upstream's last_upload == cl.base_commit we do
4996 # not need to upload any more upstreams from this point on.
4997 # (Even if there may be diverged branches higher up the tree)
4998 if base_commit == upstream_last_upload:
4999 break
5000
5001 # Case 4: If upstream's last_upload < cl.base_commit we are
5002 # uploading cl and upstream_cl.
5003 # Continue up the tree to check other branch relations.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005004 if scm.GIT.IsAncestor(upstream_last_upload, base_commit):
Joanna Wang18de1f62023-01-21 01:24:24 +00005005 continue
5006
5007 # Case 5: If cl.base_commit < upstream's last_upload the user
5008 # must rebase before uploading.
Joanna Wangab9c6ba2023-01-21 01:46:36 +00005009 if scm.GIT.IsAncestor(base_commit, upstream_last_upload):
Joanna Wang18de1f62023-01-21 01:24:24 +00005010 DieWithError(
5011 'At least one branch in the stack has diverged from its upstream '
5012 'branch and does not contain its upstream\'s last upload.\n'
5013 'Please rebase the stack with `git rebase-update` before uploading.')
5014
5015 # The tree went through a rebase. LAST_UPLOAD_HASH_CONFIG_KEY no longer has
5016 # any relation to commits in the tree. Continue up the tree until we hit
5017 # the root.
5018
5019 # We assume all cls in the stack have the same auth requirements and only
5020 # check this once.
5021 cls[0].EnsureAuthenticated(force=options.force)
5022
5023 cherry_pick = False
5024 if len(cls) > 1:
Joanna Wangd75fc882023-03-01 21:53:34 +00005025 opt_message = ''
Joanna Wang6215dd02023-02-07 15:58:03 +00005026 branches = ', '.join([cl.branch for cl in cls])
Joanna Wang18de1f62023-01-21 01:24:24 +00005027 if len(orig_args):
Joanna Wangd75fc882023-03-01 21:53:34 +00005028 opt_message = ('options %s will be used for all uploads.\n' % orig_args)
Joanna Wang18de1f62023-01-21 01:24:24 +00005029 if must_upload_upstream:
Joanna Wangd75fc882023-03-01 21:53:34 +00005030 msg = ('At least one parent branch in `%s` has never been uploaded '
5031 'and must be uploaded before/with `%s`.\n' %
5032 (branches, cls[1].branch))
5033 if options.cherry_pick_stacked:
5034 DieWithError(msg)
5035 if not options.force:
5036 confirm_or_exit('\n' + opt_message + msg)
Joanna Wang18de1f62023-01-21 01:24:24 +00005037 else:
Joanna Wangd75fc882023-03-01 21:53:34 +00005038 if options.cherry_pick_stacked:
5039 print('cherry-picking `%s` on %s\'s last upload' %
5040 (cls[0].branch, cls[1].branch))
Joanna Wang18de1f62023-01-21 01:24:24 +00005041 cherry_pick = True
Joanna Wangd75fc882023-03-01 21:53:34 +00005042 elif not options.force:
5043 answer = gclient_utils.AskForData(
5044 '\n' + opt_message +
5045 'Press enter to update branches %s.\nOr type `n` to upload only '
5046 '`%s` cherry-picked on %s\'s last upload:' %
5047 (branches, cls[0].branch, cls[1].branch))
5048 if answer.lower() == 'n':
5049 cherry_pick = True
Joanna Wang18de1f62023-01-21 01:24:24 +00005050 return cls, cherry_pick
5051
5052
Francois Dorayd42c6812017-05-30 15:10:20 -04005053@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005054@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005055def CMDsplit(parser, args):
5056 """Splits a branch into smaller branches and uploads CLs.
5057
5058 Creates a branch and uploads a CL for each group of files modified in the
5059 current branch that share a common OWNERS file. In the CL description and
Edward Lemurac5c55f2020-02-29 00:17:16 +00005060 comment, the string '$directory', is replaced with the directory containing
5061 the shared OWNERS file.
Francois Dorayd42c6812017-05-30 15:10:20 -04005062 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005063 parser.add_option('-d', '--description', dest='description_file',
5064 help='A text file containing a CL description in which '
5065 '$directory will be replaced by each CL\'s directory.')
5066 parser.add_option('-c', '--comment', dest='comment_file',
5067 help='A text file containing a CL comment.')
5068 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11005069 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005070 help='List the files and reviewers for each CL that would '
5071 'be created, but don\'t create branches or CLs.')
5072 parser.add_option('--cq-dry-run', action='store_true',
5073 help='If set, will do a cq dry run for each uploaded CL. '
5074 'Please be careful when doing this; more than ~10 CLs '
5075 'has the potential to overload our build '
5076 'infrastructure. Try to upload these not during high '
5077 'load times (usually 11-3 Mountain View time). Email '
5078 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00005079 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5080 default=True,
5081 help='Sends your change to the CQ after an approval. Only '
5082 'works on repos that have the Auto-Submit label '
5083 'enabled')
Daniel Cheng403c44e2022-10-05 22:24:58 +00005084 parser.add_option('--max-depth',
5085 type='int',
5086 default=0,
5087 help='The max depth to look for OWNERS files. Useful for '
5088 'controlling the granularity of the split CLs, e.g. '
5089 '--max-depth=1 will only split by top-level '
5090 'directory. Specifying a value less than 1 means no '
5091 'limit on max depth.')
Francois Dorayd42c6812017-05-30 15:10:20 -04005092 options, _ = parser.parse_args(args)
5093
5094 if not options.description_file:
5095 parser.error('No --description flag specified.')
5096
5097 def WrappedCMDupload(args):
5098 return CMDupload(OptionParser(), args)
5099
Daniel Cheng403c44e2022-10-05 22:24:58 +00005100 return split_cl.SplitCl(options.description_file, options.comment_file,
5101 Changelist, WrappedCMDupload, options.dry_run,
5102 options.cq_dry_run, options.enable_auto_submit,
5103 options.max_depth, settings.GetRoot())
Francois Dorayd42c6812017-05-30 15:10:20 -04005104
5105
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005106@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005107@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005108def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005109 """DEPRECATED: Used to commit the current changelist via git-svn."""
5110 message = ('git-cl no longer supports committing to SVN repositories via '
5111 'git-svn. You probably want to use `git cl land` instead.')
5112 print(message)
5113 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005114
5115
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005116@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005117@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005118def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005119 """Commits the current changelist via git.
5120
5121 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5122 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005123 """
5124 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5125 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005126 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005127 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005128 parser.add_option('--parallel', action='store_true',
5129 help='Run all tests specified by input_api.RunTests in all '
5130 'PRESUBMIT files in parallel.')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005131 parser.add_option('--resultdb', action='store_true',
5132 help='Run presubmit checks in the ResultSink environment '
5133 'and send results to the ResultDB database.')
5134 parser.add_option('--realm', help='LUCI realm if reporting to ResultDB')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005135 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005136
Edward Lemur934836a2019-09-09 20:16:54 +00005137 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005138
Robert Iannucci2e73d432018-03-14 01:10:47 -07005139 if not cl.GetIssue():
5140 DieWithError('You must upload the change first to Gerrit.\n'
5141 ' If you would rather have `git cl land` upload '
5142 'automatically for you, see http://crbug.com/642759')
Saagar Sanghavi03b15132020-08-10 16:43:41 +00005143 return cl.CMDLand(options.force, options.bypass_hooks, options.verbose,
5144 options.parallel, options.resultdb, options.realm)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005145
5146
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005147@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005148@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005149def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005150 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005151 parser.add_option('-b', dest='newbranch',
5152 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005153 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005154 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005155 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00005156 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005157
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005158 group = optparse.OptionGroup(
5159 parser,
5160 'Options for continuing work on the current issue uploaded from a '
5161 'different clone (e.g. different machine). Must be used independently '
5162 'from the other options. No issue number should be specified, and the '
5163 'branch must have an issue number associated with it')
5164 group.add_option('--reapply', action='store_true', dest='reapply',
5165 help='Reset the branch and reapply the issue.\n'
5166 'CAUTION: This will undo any local changes in this '
5167 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005168
5169 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005170 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005171 parser.add_option_group(group)
5172
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005173 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005174
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005175 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005176 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005177 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005178 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005179 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005180
Edward Lemur934836a2019-09-09 20:16:54 +00005181 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005182 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005183 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005184
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005185 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005186 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005187 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005188
5189 RunGit(['reset', '--hard', upstream])
5190 if options.pull:
5191 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005192
Edward Lemur678a6842019-10-03 22:25:05 +00005193 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
Joanna Wang44e9bee2023-01-25 21:51:42 +00005194 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5195 options.force, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005196
5197 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005198 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005199
Edward Lemurf38bc172019-09-03 21:02:13 +00005200 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005201 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005202 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005203
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005204 # We don't want uncommitted changes mixed up with the patch.
5205 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005206 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005208 if options.newbranch:
5209 if options.force:
5210 RunGit(['branch', '-D', options.newbranch],
5211 stderr=subprocess2.PIPE, error_ok=True)
Edward Lemur84101642020-02-21 21:40:34 +00005212 git_new_branch.create_new_branch(options.newbranch)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005213
Edward Lemur678a6842019-10-03 22:25:05 +00005214 cl = Changelist(
5215 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005216
Edward Lemur678a6842019-10-03 22:25:05 +00005217 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00005218 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005219
Bruce Dawsonf362f6f2021-02-18 23:15:17 +00005220 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
5221 options.force, options.newbranch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005222
5223
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005224def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005225 """Fetches the tree status and returns either 'open', 'closed',
5226 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005227 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005228 if url:
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005229 status = str(urllib.request.urlopen(url).read().lower())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005230 if status.find('closed') != -1 or status == '0':
5231 return 'closed'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005232
5233 if status.find('open') != -1 or status == '1':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005234 return 'open'
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005235
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005236 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005237 return 'unset'
5238
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005239
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005240def GetTreeStatusReason():
5241 """Fetches the tree status from a json url and returns the message
5242 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005243 url = settings.GetTreeStatusUrl()
Daniel McArdle8b4eeff2020-07-20 17:02:47 +00005244 json_url = urllib.parse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00005245 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005246 status = json.loads(connection.read())
5247 connection.close()
5248 return status['message']
5249
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005250
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005251@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005252def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005253 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005254 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005255 status = GetTreeStatus()
5256 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005257 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005258 return 2
5259
vapiera7fbd5a2016-06-16 09:17:49 -07005260 print('The tree is %s' % status)
5261 print()
5262 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263 if status != 'open':
5264 return 1
5265 return 0
5266
5267
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005268@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005269def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005270 """Triggers tryjobs using either Buildbucket or CQ dry run."""
5271 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005272 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005273 '-b', '--bot', action='append',
5274 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5275 'times to specify multiple builders. ex: '
5276 '"-b win_rel -b win_layout". See '
5277 'the try server waterfall for the builders name and the tests '
5278 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005279 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005280 '-B', '--bucket', default='',
Ben Pastene08a30b22022-05-04 17:46:38 +00005281 help=('Buildbucket bucket to send the try requests. Format: '
5282 '"luci.$LUCI_PROJECT.$LUCI_BUCKET". eg: "luci.chromium.try"'))
borenet6c0efe62016-10-19 08:13:29 -07005283 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005284 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005285 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07005286 'be determined by the try recipe that builder runs, which usually '
Josip Sokcevicc39ab992020-09-24 20:09:15 +00005287 'defaults to HEAD of origin/master or origin/main')
maruel@chromium.org15192402012-09-06 12:38:29 +00005288 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005289 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005290 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005291 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005292 group.add_option(
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005293 '-q',
5294 '--quick-run',
5295 action='store_true',
5296 default=False,
5297 help='trigger in quick run mode '
5298 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_q'
5299 'uick_run.md) (chromium only).')
5300 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005301 '--category', default='git_cl_try', help='Specify custom build category.')
5302 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005303 '--project',
5304 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005305 'in recipe to determine to which repository or directory to '
5306 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005307 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005308 '-p', '--property', dest='properties', action='append', default=[],
5309 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005310 'key2=value2 etc. The value will be treated as '
5311 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005312 'NOTE: using this may make your tryjob not usable for CQ, '
5313 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005314 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005315 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5316 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005317 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005318 parser.add_option(
5319 '-R', '--retry-failed', action='store_true', default=False,
5320 help='Retry failed jobs from the latest set of tryjobs. '
5321 'Not allowed with --bucket and --bot options.')
Edward Lemur52969c92020-02-06 18:15:28 +00005322 parser.add_option(
5323 '-i', '--issue', type=int,
5324 help='Operate on this issue instead of the current branch\'s implicit '
5325 'issue.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005326 options, args = parser.parse_args(args)
5327
machenbach@chromium.org45453142015-09-15 08:45:22 +00005328 # Make sure that all properties are prop=value pairs.
5329 bad_params = [x for x in options.properties if '=' not in x]
5330 if bad_params:
5331 parser.error('Got properties with missing "=": %s' % bad_params)
5332
maruel@chromium.org15192402012-09-06 12:38:29 +00005333 if args:
5334 parser.error('Unknown arguments: %s' % args)
5335
Edward Lemur934836a2019-09-09 20:16:54 +00005336 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005338 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005339
Edward Lemurf38bc172019-09-03 21:02:13 +00005340 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00005341 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005342
tandriie113dfd2016-10-11 10:20:12 -07005343 error_message = cl.CannotTriggerTryJobReason()
5344 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005345 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005346
Edward Lemur45768512020-03-02 19:03:14 +00005347 if options.bot:
5348 if options.retry_failed:
5349 parser.error('--bot is not compatible with --retry-failed.')
5350 if not options.bucket:
5351 parser.error('A bucket (e.g. "chromium/try") is required.')
5352
5353 triggered = [b for b in options.bot if 'triggered' in b]
5354 if triggered:
5355 parser.error(
5356 'Cannot schedule builds on triggered bots: %s.\n'
5357 'This type of bot requires an initial job from a parent (usually a '
5358 'builder). Schedule a job on the parent instead.\n' % triggered)
5359
5360 if options.bucket.startswith('.master'):
5361 parser.error('Buildbot masters are not supported.')
5362
5363 project, bucket = _parse_bucket(options.bucket)
5364 if project is None or bucket is None:
5365 parser.error('Invalid bucket: %s.' % options.bucket)
5366 jobs = sorted((project, bucket, bot) for bot in options.bot)
5367 elif options.retry_failed:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005368 print('Searching for failed tryjobs...')
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005369 builds, patchset = _fetch_latest_builds(cl, DEFAULT_BUILDBUCKET_HOST)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005370 if options.verbose:
5371 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Edward Lemur45768512020-03-02 19:03:14 +00005372 jobs = _filter_failed_for_retry(builds)
5373 if not jobs:
Quinten Yearsley983111f2019-09-26 17:18:48 +00005374 print('There are no failed jobs in the latest set of jobs '
5375 '(patchset #%d), doing nothing.' % patchset)
5376 return 0
Edward Lemur45768512020-03-02 19:03:14 +00005377 num_builders = len(jobs)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005378 if num_builders > 10:
5379 confirm_or_exit('There are %d builders with failed builds.'
5380 % num_builders, action='continue')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005381 elif options.quick_run:
5382 print('Scheduling CQ quick run on: %s' % cl.GetIssueURL())
5383 return cl.SetCQState(_CQState.QUICK_RUN)
Quinten Yearsley983111f2019-09-26 17:18:48 +00005384 else:
qyearsley1fdfcb62016-10-24 13:22:03 -07005385 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005386 print('git cl try with no bots now defaults to CQ dry run.')
5387 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5388 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005389
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005390 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00005391 try:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005392 _trigger_tryjobs(cl, jobs, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00005393 except BuildbucketResponseException as ex:
5394 print('ERROR: %s' % ex)
5395 return 1
5396 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00005397
5398
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005399@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005400def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005401 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005402 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005403 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005404 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005405 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005406 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005407 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005408 '--color', action='store_true', default=setup_color.IS_TTY,
5409 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005410 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005411 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5412 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005413 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005414 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07005415 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005416 parser.add_option_group(group)
Edward Lemur52969c92020-02-06 18:15:28 +00005417 parser.add_option(
5418 '-i', '--issue', type=int,
5419 help='Operate on this issue instead of the current branch\'s implicit '
5420 'issue.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005421 options, args = parser.parse_args(args)
5422 if args:
5423 parser.error('Unrecognized args: %s' % ' '.join(args))
5424
Edward Lemur934836a2019-09-09 20:16:54 +00005425 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005426 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005427 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005428
tandrii221ab252016-10-06 08:12:04 -07005429 patchset = options.patchset
5430 if not patchset:
Gavin Make61ccc52020-11-13 00:12:57 +00005431 patchset = cl.GetMostRecentDryRunPatchset()
tandrii221ab252016-10-06 08:12:04 -07005432 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005433 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07005434 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005435 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07005436 cl.GetIssue())
5437
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005438 try:
Joanna Wanga8db0cb2023-01-24 15:43:17 +00005439 jobs = _fetch_tryjobs(cl, DEFAULT_BUILDBUCKET_HOST, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005440 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005441 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005442 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005443 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00005444 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07005445 else:
Quinten Yearsley777660f2020-03-04 23:37:06 +00005446 _print_tryjobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005447 return 0
5448
5449
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005450@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005451@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005452def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005453 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005454 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005455 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005456 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005457
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005458 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005459 if args:
5460 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005461 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005462 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005463 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005464 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005465
5466 # Clear configured merge-base, if there is one.
5467 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005468 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005469 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005470 return 0
5471
5472
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005473@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005474def CMDweb(parser, args):
5475 """Opens the current CL in the web browser."""
Orr Bernstein0b960582022-12-22 20:16:18 +00005476 parser.add_option('-p',
5477 '--print-only',
5478 action='store_true',
5479 dest='print_only',
5480 help='Only print the Gerrit URL, don\'t open it in the '
5481 'browser.')
5482 (options, args) = parser.parse_args(args)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005483 if args:
5484 parser.error('Unrecognized args: %s' % ' '.join(args))
5485
5486 issue_url = Changelist().GetIssueURL()
5487 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005488 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005489 return 1
5490
Orr Bernstein0b960582022-12-22 20:16:18 +00005491 if options.print_only:
5492 print(issue_url)
5493 return 0
5494
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005495 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005496 # allows us to hide the "Created new window in existing browser session."
5497 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005498 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005499 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005500 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005501 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005502 os.open(os.devnull, os.O_RDWR)
5503 try:
5504 webbrowser.open(issue_url)
5505 finally:
5506 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00005507 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005508 return 0
5509
5510
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005511@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005512def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00005513 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005514 parser.add_option('-d', '--dry-run', action='store_true',
5515 help='trigger in dry run mode')
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005516 parser.add_option(
5517 '-q',
5518 '--quick-run',
5519 action='store_true',
5520 help='trigger in quick run mode '
5521 '(https://source.chromium.org/chromium/chromium/src/+/main:docs/cq_qu'
5522 'ick_run.md) (chromium only).')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005523 parser.add_option('-c', '--clear', action='store_true',
5524 help='stop CQ run, if any')
Edward Lemur52969c92020-02-06 18:15:28 +00005525 parser.add_option(
5526 '-i', '--issue', type=int,
5527 help='Operate on this issue instead of the current branch\'s implicit '
5528 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005529 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005530 if args:
5531 parser.error('Unrecognized args: %s' % ' '.join(args))
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005532 if [options.dry_run, options.quick_run, options.clear].count(True) > 1:
5533 parser.error('Only one of --dry-run, --quick-run, and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005534
Edward Lemur934836a2019-09-09 20:16:54 +00005535 cl = Changelist(issue=options.issue)
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005536 if not cl.GetIssue():
5537 parser.error('Must upload the issue first.')
5538
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005539 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005540 state = _CQState.NONE
Greg Gutermanbe5fccd2021-06-14 17:58:20 +00005541 elif options.quick_run:
5542 state = _CQState.QUICK_RUN
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005543 elif options.dry_run:
5544 state = _CQState.DRY_RUN
5545 else:
5546 state = _CQState.COMMIT
tandrii9de9ec62016-07-13 03:01:59 -07005547 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005548 return 0
5549
5550
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005551@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005552def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005553 """Closes the issue."""
Edward Lemur52969c92020-02-06 18:15:28 +00005554 parser.add_option(
5555 '-i', '--issue', type=int,
5556 help='Operate on this issue instead of the current branch\'s implicit '
5557 'issue.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005558 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005559 if args:
5560 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005561 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005562 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005563 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005564 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005565 cl.CloseIssue()
5566 return 0
5567
5568
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005569@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005570def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005571 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005572 parser.add_option(
5573 '--stat',
5574 action='store_true',
5575 dest='stat',
5576 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005577 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005578 if args:
5579 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005580
Edward Lemur934836a2019-09-09 20:16:54 +00005581 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005582 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005583 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005584 if not issue:
5585 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005586
Gavin Makbe2e9262022-11-08 23:41:55 +00005587 base = cl._GitGetBranchConfigValue(LAST_UPLOAD_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005588 if not base:
Gavin Makbe2e9262022-11-08 23:41:55 +00005589 base = cl._GitGetBranchConfigValue(GERRIT_SQUASH_HASH_CONFIG_KEY)
Aaron Gablea718c3e2017-08-28 17:47:28 -07005590 if not base:
5591 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5592 revision_info = detail['revisions'][detail['current_revision']]
5593 fetch_info = revision_info['fetch']['http']
5594 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5595 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005596
Aaron Gablea718c3e2017-08-28 17:47:28 -07005597 cmd = ['git', 'diff']
5598 if options.stat:
5599 cmd.append('--stat')
5600 cmd.append(base)
5601 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005602
5603 return 0
5604
5605
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005606@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005607def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005608 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005609 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005610 '--ignore-current',
5611 action='store_true',
5612 help='Ignore the CL\'s current reviewers and start from scratch.')
5613 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005614 '--ignore-self',
5615 action='store_true',
5616 help='Do not consider CL\'s author as an owners.')
5617 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005618 '--no-color',
5619 action='store_true',
5620 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005621 parser.add_option(
5622 '--batch',
5623 action='store_true',
5624 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005625 # TODO: Consider moving this to another command, since other
5626 # git-cl owners commands deal with owners for a given CL.
5627 parser.add_option(
5628 '--show-all',
5629 action='store_true',
5630 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005631 options, args = parser.parse_args(args)
5632
Edward Lemur934836a2019-09-09 20:16:54 +00005633 cl = Changelist()
Edward Lesmes50da7702020-03-30 19:23:43 +00005634 author = cl.GetAuthor()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005635
Yang Guo6e269a02019-06-26 11:17:02 +00005636 if options.show_all:
Bruce Dawson97ed44a2020-05-06 17:04:03 +00005637 if len(args) == 0:
5638 print('No files specified for --show-all. Nothing to do.')
5639 return 0
Edward Lesmese1576912021-02-16 21:53:34 +00005640 owners_by_path = cl.owners_client.BatchListOwners(args)
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00005641 for path in args:
5642 print('Owners for %s:' % path)
5643 print('\n'.join(
5644 ' - %s' % owner
5645 for owner in owners_by_path.get(path, ['No owners found'])))
Yang Guo6e269a02019-06-26 11:17:02 +00005646 return 0
5647
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005648 if args:
5649 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005650 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005651 base_branch = args[0]
5652 else:
5653 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005654 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005655
Edward Lemur2c62b332020-03-12 22:12:33 +00005656 affected_files = cl.GetAffectedFiles(base_branch)
Dirk Prankebf980882017-09-02 15:08:00 -07005657
5658 if options.batch:
Edward Lesmese1576912021-02-16 21:53:34 +00005659 owners = cl.owners_client.SuggestOwners(affected_files, exclude=[author])
5660 print('\n'.join(owners))
Dirk Prankebf980882017-09-02 15:08:00 -07005661 return 0
5662
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005663 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005664 affected_files,
Edward Lemur707d70b2018-02-07 00:50:14 +01005665 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005666 [] if options.ignore_current else cl.GetReviewers(),
Edward Lesmes5cd75472021-02-19 00:34:25 +00005667 cl.owners_client,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005668 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005669 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005670
5671
Aiden Bennerc08566e2018-10-03 17:52:42 +00005672def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005673 """Generates a diff command."""
5674 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005675 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5676
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005677 if allow_prefix:
5678 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5679 # case that diff.noprefix is set in the user's git config.
5680 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5681 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005682 diff_cmd += ['--no-prefix']
5683
5684 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005685
5686 if args:
5687 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005688 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005689 diff_cmd.append(arg)
5690 else:
5691 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005692
5693 return diff_cmd
5694
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005695
Jamie Madill5e96ad12020-01-13 16:08:35 +00005696def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5697 """Runs clang-format-diff and sets a return value if necessary."""
5698
5699 if not clang_diff_files:
5700 return 0
5701
5702 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5703 # formatted. This is used to block during the presubmit.
5704 return_value = 0
5705
5706 # Locate the clang-format binary in the checkout
5707 try:
5708 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5709 except clang_format.NotFoundError as e:
5710 DieWithError(e)
5711
5712 if opts.full or settings.GetFormatFullByDefault():
5713 cmd = [clang_format_tool]
5714 if not opts.dry_run and not opts.diff:
5715 cmd.append('-i')
5716 if opts.dry_run:
5717 for diff_file in clang_diff_files:
5718 with open(diff_file, 'r') as myfile:
5719 code = myfile.read().replace('\r\n', '\n')
5720 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5721 stdout = stdout.replace('\r\n', '\n')
5722 if opts.diff:
5723 sys.stdout.write(stdout)
5724 if code != stdout:
5725 return_value = 2
5726 else:
5727 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5728 if opts.diff:
5729 sys.stdout.write(stdout)
5730 else:
Jamie Madill5e96ad12020-01-13 16:08:35 +00005731 try:
5732 script = clang_format.FindClangFormatScriptInChromiumTree(
5733 'clang-format-diff.py')
5734 except clang_format.NotFoundError as e:
5735 DieWithError(e)
5736
Josip Sokcevic2a827fc2022-03-04 17:51:47 +00005737 cmd = ['vpython3', script, '-p0']
Jamie Madill5e96ad12020-01-13 16:08:35 +00005738 if not opts.dry_run and not opts.diff:
5739 cmd.append('-i')
5740
5741 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
Edward Lemur1a83da12020-03-04 21:18:36 +00005742 diff_output = RunGit(diff_cmd).encode('utf-8')
Jamie Madill5e96ad12020-01-13 16:08:35 +00005743
Edward Lesmes89624cd2020-04-06 17:51:56 +00005744 env = os.environ.copy()
5745 env['PATH'] = (
5746 str(os.path.dirname(clang_format_tool)) + os.pathsep + env['PATH'])
5747 stdout = RunCommand(
5748 cmd, stdin=diff_output, cwd=top_dir, env=env,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00005749 shell=sys.platform.startswith('win32'))
Jamie Madill5e96ad12020-01-13 16:08:35 +00005750 if opts.diff:
5751 sys.stdout.write(stdout)
5752 if opts.dry_run and len(stdout) > 0:
5753 return_value = 2
5754
5755 return return_value
5756
5757
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005758def _RunRustFmt(opts, rust_diff_files, top_dir, upstream_commit):
5759 """Runs rustfmt. Just like _RunClangFormatDiff returns 2 to indicate that
5760 presubmit checks have failed (and returns 0 otherwise)."""
5761
5762 if not rust_diff_files:
5763 return 0
5764
5765 # Locate the rustfmt binary.
5766 try:
5767 rustfmt_tool = rustfmt.FindRustfmtToolInChromiumTree()
5768 except rustfmt.NotFoundError as e:
5769 DieWithError(e)
5770
Lukasz Anforowicz9696c7f2023-05-03 17:26:04 +00005771 # TODO(crbug.com/1440869): Support formatting only the changed lines
5772 # if `opts.full or settings.GetFormatFullByDefault()` is False.
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005773 cmd = [rustfmt_tool]
5774 if opts.dry_run:
5775 cmd.append('--check')
5776 cmd += rust_diff_files
5777 rustfmt_exitcode = subprocess2.call(cmd)
5778
5779 if opts.presubmit and rustfmt_exitcode != 0:
5780 return 2
Aravind Vasudevanc5f0cbb2022-01-24 23:56:57 +00005781
5782 return 0
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005783
5784
Olivier Robin0a6b5442022-04-07 07:25:04 +00005785def _RunSwiftFormat(opts, swift_diff_files, top_dir, upstream_commit):
5786 """Runs swift-format. Just like _RunClangFormatDiff returns 2 to indicate
5787 that presubmit checks have failed (and returns 0 otherwise)."""
5788
5789 if not swift_diff_files:
5790 return 0
5791
5792 # Locate the swift-format binary.
5793 try:
5794 swift_format_tool = swift_format.FindSwiftFormatToolInChromiumTree()
5795 except swift_format.NotFoundError as e:
5796 DieWithError(e)
5797
5798 cmd = [swift_format_tool]
5799 if opts.dry_run:
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005800 cmd += ['lint', '-s']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005801 else:
5802 cmd += ['format', '-i']
5803 cmd += swift_diff_files
5804 swift_format_exitcode = subprocess2.call(cmd)
5805
5806 if opts.presubmit and swift_format_exitcode != 0:
5807 return 2
5808
5809 return 0
5810
5811
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005812def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005813 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005814 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005815
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005816
enne@chromium.org555cfe42014-01-29 18:21:39 +00005817@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005818@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005819def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005820 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005821 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005822 GN_EXTS = ['.gn', '.gni', '.typemap']
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005823 RUST_EXTS = ['.rs']
Olivier Robin0a6b5442022-04-07 07:25:04 +00005824 SWIFT_EXTS = ['.swift']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005825 parser.add_option('--full', action='store_true',
5826 help='Reformat the full content of all touched files')
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005827 parser.add_option('--upstream', help='Branch to check against')
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005828 parser.add_option('--dry-run', action='store_true',
5829 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005830 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005831 '--no-clang-format',
5832 dest='clang_format',
5833 action='store_false',
5834 default=True,
5835 help='Disables formatting of various file types using clang-format.')
5836 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005837 '--python',
5838 action='store_true',
5839 default=None,
5840 help='Enables python formatting on all python files.')
5841 parser.add_option(
5842 '--no-python',
5843 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005844 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005845 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005846 'If neither --python or --no-python are set, python files that have a '
5847 '.style.yapf file in an ancestor directory will be formatted. '
5848 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005849 parser.add_option(
5850 '--js',
5851 action='store_true',
5852 help='Format javascript code with clang-format. '
5853 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005854 parser.add_option('--diff', action='store_true',
5855 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005856 parser.add_option('--presubmit', action='store_true',
5857 help='Used when running the script from a presubmit.')
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005858
5859 parser.add_option('--rust-fmt',
5860 dest='use_rust_fmt',
5861 action='store_true',
5862 default=rustfmt.IsRustfmtSupported(),
5863 help='Enables formatting of Rust file types using rustfmt.')
5864 parser.add_option(
5865 '--no-rust-fmt',
5866 dest='use_rust_fmt',
5867 action='store_false',
5868 help='Disables formatting of Rust file types using rustfmt.')
5869
Olivier Robin0a6b5442022-04-07 07:25:04 +00005870 parser.add_option(
5871 '--swift-format',
5872 dest='use_swift_format',
5873 action='store_true',
Olivier Robin7f39e3d2022-04-28 08:20:49 +00005874 default=swift_format.IsSwiftFormatSupported(),
Olivier Robin0a6b5442022-04-07 07:25:04 +00005875 help='Enables formatting of Swift file types using swift-format '
5876 '(macOS host only).')
5877 parser.add_option(
5878 '--no-swift-format',
5879 dest='use_swift_format',
5880 action='store_false',
5881 help='Disables formatting of Swift file types using swift-format.')
5882
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005883 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005884
Garrett Beaty91a6f332020-01-06 16:57:24 +00005885 if opts.python is not None and opts.no_python:
5886 raise parser.error('Cannot set both --python and --no-python')
5887 if opts.no_python:
5888 opts.python = False
5889
Daniel Chengc55eecf2016-12-30 03:11:02 -08005890 # Normalize any remaining args against the current path, so paths relative to
5891 # the current directory are still resolved as expected.
5892 args = [os.path.join(os.getcwd(), arg) for arg in args]
5893
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005894 # git diff generates paths against the root of the repository. Change
5895 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005896 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005897 if rel_base_path:
5898 os.chdir(rel_base_path)
5899
digit@chromium.org29e47272013-05-17 17:01:46 +00005900 # Grab the merge-base commit, i.e. the upstream commit of the current
5901 # branch when it was created or the last time it was rebased. This is
5902 # to cover the case where the user may have called "git fetch origin",
5903 # moving the origin branch to a newer commit, but hasn't rebased yet.
5904 upstream_commit = None
Tomasz Åšniatowski58194462021-08-27 17:36:16 +00005905 upstream_branch = opts.upstream
5906 if not upstream_branch:
5907 cl = Changelist()
5908 upstream_branch = cl.GetUpstreamBranch()
digit@chromium.org29e47272013-05-17 17:01:46 +00005909 if upstream_branch:
5910 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5911 upstream_commit = upstream_commit.strip()
5912
5913 if not upstream_commit:
5914 DieWithError('Could not find base commit for this branch. '
5915 'Are you in detached state?')
5916
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005917 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5918 diff_output = RunGit(changed_files_cmd)
5919 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005920 # Filter out files deleted by this CL
5921 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005922
Andreas Haas417d89c2020-02-06 10:24:27 +00005923 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005924 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005925
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005926 clang_diff_files = []
5927 if opts.clang_format:
5928 clang_diff_files = [
5929 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5930 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005931 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005932 rust_diff_files = [x for x in diff_files if MatchingFileType(x, RUST_EXTS)]
Olivier Robin0a6b5442022-04-07 07:25:04 +00005933 swift_diff_files = [x for x in diff_files if MatchingFileType(x, SWIFT_EXTS)]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005934 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005935
Edward Lesmes50da7702020-03-30 19:23:43 +00005936 top_dir = settings.GetRoot()
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005937
Jamie Madill5e96ad12020-01-13 16:08:35 +00005938 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5939 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005940
Lukasz Anforowiczb4d39542021-09-30 23:39:25 +00005941 if opts.use_rust_fmt:
5942 rust_fmt_return_value = _RunRustFmt(opts, rust_diff_files, top_dir,
5943 upstream_commit)
5944 if rust_fmt_return_value == 2:
5945 return_value = 2
5946
Olivier Robin0a6b5442022-04-07 07:25:04 +00005947 if opts.use_swift_format:
5948 if sys.platform != 'darwin':
5949 DieWithError('swift-format is only supported on macOS.')
5950 swift_format_return_value = _RunSwiftFormat(opts, swift_diff_files, top_dir,
5951 upstream_commit)
5952 if swift_format_return_value == 2:
5953 return_value = 2
5954
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005955 # Similar code to above, but using yapf on .py files rather than clang-format
5956 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005957 py_explicitly_disabled = opts.python is not None and not opts.python
5958 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005959 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5960 yapf_tool = os.path.join(depot_tools_path, 'yapf')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005961
Aiden Bennerc08566e2018-10-03 17:52:42 +00005962 # Used for caching.
5963 yapf_configs = {}
5964 for f in python_diff_files:
5965 # Find the yapf style config for the current file, defaults to depot
5966 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005967 _FindYapfConfigFile(f, yapf_configs, top_dir)
5968
5969 # Turn on python formatting by default if a yapf config is specified.
5970 # This breaks in the case of this repo though since the specified
5971 # style file is also the global default.
5972 if opts.python is None:
5973 filtered_py_files = []
5974 for f in python_diff_files:
5975 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5976 filtered_py_files.append(f)
5977 else:
5978 filtered_py_files = python_diff_files
5979
5980 # Note: yapf still seems to fix indentation of the entire file
5981 # even if line ranges are specified.
5982 # See https://github.com/google/yapf/issues/499
5983 if not opts.full and filtered_py_files:
5984 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5985
Brian Sheedyb4307d52019-12-02 19:18:17 +00005986 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5987 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5988 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005989
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005990 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005991 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5992 # Default to pep8 if not .style.yapf is found.
5993 if not yapf_style:
5994 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005995
Peter Wend9399922020-06-17 17:33:49 +00005996 with open(f, 'r') as py_f:
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005997 if 'python2' in py_f.readline():
Peter Wend9399922020-06-17 17:33:49 +00005998 vpython_script = 'vpython'
Andrew Grieveb9e694c2021-11-15 19:04:46 +00005999 else:
6000 vpython_script = 'vpython3'
Peter Wend9399922020-06-17 17:33:49 +00006001
6002 cmd = [vpython_script, yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00006003
6004 has_formattable_lines = False
6005 if not opts.full:
6006 # Only run yapf over changed line ranges.
6007 for diff_start, diff_len in py_line_diffs[f]:
6008 diff_end = diff_start + diff_len - 1
6009 # Yapf errors out if diff_end < diff_start but this
6010 # is a valid line range diff for a removal.
6011 if diff_end >= diff_start:
6012 has_formattable_lines = True
6013 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6014 # If all line diffs were removals we have nothing to format.
6015 if not has_formattable_lines:
6016 continue
6017
6018 if opts.diff or opts.dry_run:
6019 cmd += ['--diff']
6020 # Will return non-zero exit code if non-empty diff.
Edward Lesmesb7db1832020-06-22 20:22:27 +00006021 stdout = RunCommand(cmd,
6022 error_ok=True,
Josip Sokcevic673e8ed2021-10-27 23:46:18 +00006023 stderr=subprocess2.PIPE,
Edward Lesmesb7db1832020-06-22 20:22:27 +00006024 cwd=top_dir,
6025 shell=sys.platform.startswith('win32'))
Aiden Bennerc08566e2018-10-03 17:52:42 +00006026 if opts.diff:
6027 sys.stdout.write(stdout)
6028 elif len(stdout) > 0:
6029 return_value = 2
6030 else:
6031 cmd += ['-i']
Edward Lesmesb7db1832020-06-22 20:22:27 +00006032 RunCommand(cmd, cwd=top_dir, shell=sys.platform.startswith('win32'))
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006033
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006034 # Format GN build files. Always run on full build files for canonical form.
6035 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006036 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006037 if opts.dry_run or opts.diff:
6038 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006039 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006040 gn_ret = subprocess2.call(cmd + [gn_diff_file],
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006041 shell=sys.platform.startswith('win'),
brettw4b8ed592016-08-05 16:19:12 -07006042 cwd=top_dir)
6043 if opts.dry_run and gn_ret == 2:
6044 return_value = 2 # Not formatted.
6045 elif opts.diff and gn_ret == 2:
6046 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006047 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07006048 elif gn_ret != 0:
6049 # For non-dry run cases (and non-2 return values for dry-run), a
6050 # nonzero error code indicates a failure, probably because the file
6051 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006052 DieWithError('gn format failed on ' + gn_diff_file +
6053 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006054
Ilya Shermane081cbe2017-08-15 17:51:04 -07006055 # Skip the metrics formatting from the global presubmit hook. These files have
6056 # a separate presubmit hook that issues an error if the files need formatting,
6057 # whereas the top-level presubmit script merely issues a warning. Formatting
6058 # these files is somewhat slow, so it's important not to duplicate the work.
6059 if not opts.presubmit:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006060 for diff_xml in GetDiffXMLs(diff_files):
6061 xml_dir = GetMetricsDir(diff_xml)
6062 if not xml_dir:
6063 continue
6064
Ilya Shermane081cbe2017-08-15 17:51:04 -07006065 tool_dir = os.path.join(top_dir, xml_dir)
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006066 pretty_print_tool = os.path.join(tool_dir, 'pretty_print.py')
Fabrice de Gansecfab092022-09-15 20:59:01 +00006067 cmd = ['vpython3', pretty_print_tool, '--non-interactive']
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006068
6069 # If the XML file is histograms.xml or enums.xml, add the xml path to the
6070 # command as histograms/pretty_print.py now needs a relative path argument
6071 # after splitting the histograms into multiple directories.
6072 # For example, in tools/metrics/ukm, pretty-print could be run using:
6073 # $ python pretty_print.py
6074 # But in tools/metrics/histogrmas, pretty-print should be run with an
6075 # additional relative path argument, like:
Peter Kastingee088882021-08-03 17:57:00 +00006076 # $ python pretty_print.py metadata/UMA/histograms.xml
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006077 # $ python pretty_print.py enums.xml
6078
Weilun Shib92c4b72020-08-27 17:45:11 +00006079 if (diff_xml.endswith('histograms.xml') or diff_xml.endswith('enums.xml')
Weilun Shi4f50adb2023-01-17 20:43:17 +00006080 or diff_xml.endswith('histogram_suffixes_list.xml')):
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006081 cmd.append(diff_xml)
6082
Ilya Shermane081cbe2017-08-15 17:51:04 -07006083 if opts.dry_run or opts.diff:
6084 cmd.append('--diff')
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006085
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006086 # TODO(isherman): Once this file runs only on Python 3.3+, drop the
6087 # `shell` param and instead replace `'vpython'` with
6088 # `shutil.which('frob')` above: https://stackoverflow.com/a/32799942
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006089 stdout = RunCommand(cmd,
6090 cwd=top_dir,
Ilya Sherman7aed4bb2020-05-20 22:34:14 +00006091 shell=sys.platform.startswith('win32'))
Ilya Shermane081cbe2017-08-15 17:51:04 -07006092 if opts.diff:
6093 sys.stdout.write(stdout)
6094 if opts.dry_run and stdout:
6095 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006096
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006097 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006098
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006099
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006100def GetDiffXMLs(diff_files):
6101 return [
6102 os.path.normpath(x) for x in diff_files if MatchingFileType(x, ['.xml'])
6103 ]
6104
6105
6106def GetMetricsDir(diff_xml):
Steven Holte2e664bf2017-04-21 13:10:47 -07006107 metrics_xml_dirs = [
6108 os.path.join('tools', 'metrics', 'actions'),
6109 os.path.join('tools', 'metrics', 'histograms'),
6110 os.path.join('tools', 'metrics', 'rappor'),
Ilya Shermanb67e60c2020-05-20 22:27:03 +00006111 os.path.join('tools', 'metrics', 'structured'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006112 os.path.join('tools', 'metrics', 'ukm'),
6113 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07006114 for xml_dir in metrics_xml_dirs:
Wenhan (Han) Zhang3bd3c992020-08-14 16:27:39 +00006115 if diff_xml.startswith(xml_dir):
6116 return xml_dir
6117 return None
Steven Holte2e664bf2017-04-21 13:10:47 -07006118
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006119
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006120@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006121@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006122def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00006123 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006124 _, args = parser.parse_args(args)
6125
6126 if len(args) != 1:
6127 parser.print_help()
6128 return 1
6129
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006130 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006131 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006132 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006133
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006134 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006135
Edward Lemur52969c92020-02-06 18:15:28 +00006136 output = RunGit(['config', '--local', '--get-regexp',
Edward Lesmes50da7702020-03-30 19:23:43 +00006137 r'branch\..*\.' + ISSUE_CONFIG_KEY],
Edward Lemur52969c92020-02-06 18:15:28 +00006138 error_ok=True)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006139
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006140 branches = []
Edward Lemur52969c92020-02-06 18:15:28 +00006141 for key, issue in [x.split() for x in output.splitlines()]:
6142 if issue == target_issue:
Edward Lesmes50da7702020-03-30 19:23:43 +00006143 branches.append(re.sub(r'branch\.(.*)\.' + ISSUE_CONFIG_KEY, r'\1', key))
Edward Lemur52969c92020-02-06 18:15:28 +00006144
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006145 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006146 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006147 return 1
6148 if len(branches) == 1:
6149 RunGit(['checkout', branches[0]])
6150 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006151 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006152 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006153 print('%d: %s' % (i, branches[i]))
Edward Lesmesae3586b2020-03-23 21:21:14 +00006154 which = gclient_utils.AskForData('Choose by index: ')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006155 try:
6156 RunGit(['checkout', branches[int(which)]])
6157 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006158 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006159 return 1
6160
6161 return 0
6162
6163
maruel@chromium.org29404b52014-09-08 22:58:00 +00006164def CMDlol(parser, args):
6165 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006166 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006167 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6168 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6169 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
Gavin Mak18f45d22020-12-04 21:45:10 +00006170 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')).decode('utf-8'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006171 return 0
6172
6173
Josip Sokcevic0399e172022-03-21 23:11:51 +00006174def CMDversion(parser, args):
Josip Sokcevica9a7eec2023-03-10 03:54:52 +00006175 import utils
Josip Sokcevic0399e172022-03-21 23:11:51 +00006176 print(utils.depot_tools_version())
6177
6178
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006179class OptionParser(optparse.OptionParser):
6180 """Creates the option parse and add --verbose support."""
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00006181
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006182 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006183 optparse.OptionParser.__init__(
6184 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006185 self.add_option(
6186 '-v', '--verbose', action='count', default=0,
6187 help='Use 2 times for more debugging info')
6188
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006189 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006190 try:
6191 return self._parse_args(args)
6192 finally:
6193 # Regardless of success or failure of args parsing, we want to report
6194 # metrics, but only after logging has been initialized (if parsing
6195 # succeeded).
6196 global settings
6197 settings = Settings()
6198
Edward Lesmes9c349062021-05-06 20:02:39 +00006199 if metrics.collector.config.should_collect_metrics:
Joanna Wangc5b38322023-03-15 20:38:46 +00006200 try:
6201 # GetViewVCUrl ultimately calls logging method.
6202 project_url = settings.GetViewVCUrl().strip('/+')
6203 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
6204 metrics.collector.add('project_urls', [project_url])
6205 except subprocess2.CalledProcessError:
6206 # Occurs when command is not executed in a git repository
6207 # We should not fail here. If the command needs to be executed
6208 # in a repo, it will be raised later.
6209 pass
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00006210
6211 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006212 # Create an optparse.Values object that will store only the actual passed
6213 # options, without the defaults.
6214 actual_options = optparse.Values()
6215 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6216 # Create an optparse.Values object with the default options.
6217 options = optparse.Values(self.get_default_values().__dict__)
6218 # Update it with the options passed by the user.
6219 options._update_careful(actual_options.__dict__)
6220 # Store the options passed by the user in an _actual_options attribute.
6221 # We store only the keys, and not the values, since the values can contain
6222 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00006223 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006224
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006225 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006226 logging.basicConfig(
6227 level=levels[min(options.verbose, len(levels) - 1)],
6228 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6229 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006230
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006231 return options, args
6232
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006233
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006234def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006235 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006236 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07006237 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006238 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006239
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006240 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006241 dispatcher = subcommand.CommandDispatcher(__name__)
6242 try:
6243 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00006244 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006245 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00006246 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006247 if e.code != 500:
6248 raise
6249 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006250 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00006251 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006252 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006253
6254
6255if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00006256 # These affect sys.stdout, so do it outside of main() to simplify mocks in
6257 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006258 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006259 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006260 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006261 sys.exit(main(sys.argv[1:]))